karasz
/
package-update
1
0
Fork 0
Code Issues Releases Activity
Browse Source

bcron: Updated (0.09 -> 0.10) 

Note:

- the 'initgroups.patch' is obsolete now because the issue was fixed upstream
- the 'make_install.patch' has been replaced by an improved version, which will
  also install man pages
user/chris/wip/linux37
Christian Wiese 12 years ago committed by Christian Wiese
parent
88f66fd223
commit
c19757d2ce
6 changed files with 94 additions and 74 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 57
      base/bcron/bcron-0.10-make-install.patch
  2. 31
      base/bcron/bcron-0.10-no-python.patch
  3. 5
      base/bcron/bcron.conf
  4. 6
      base/bcron/bcron.desc
  5. 27
      base/bcron/initgroups.patch
  6. 42
      base/bcron/make_install.patch

57
base/bcron/bcron-0.10-make-install.patch
Unescape View File

@ -0,0 +1,57 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../bcron/bcron-0.10-make-install.patch
# Copyright (C) 2013 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- ./Makefile.orig 2013-04-18 13:41:10.011910953 +0200
+++ ./Makefile 2013-04-18 13:58:39.876580718 +0200
@@ -4,6 +4,14 @@
SHELL=/bin/sh
+DESTDIR=
+PREFIX=/usr/local
+BINDIR=$(PREFIX)/bin
+MANDIR=$(PREFIX)/share/man
+MAN1DIR=$(MANDIR)/man1
+MAN5DIR=$(MANDIR)/man5
+MAN8DIR=$(MANDIR)/man8
+
DEFAULT: all
all: libraries programs docs
@@ -109,8 +117,21 @@
docs: bcron.info bcron.html crontab.5.html bcrontab.1.html bcron-spool.8.html bcron-sched.8.html bcron-exec.8.html bcron-start.8.html bcron-update.8.html
install: INSTHIER conf-bin conf-man
- bg-installer -v <INSTHIER
- bg-installer -c <INSTHIER
+ install -m 0755 bcron-exec $(DESTDIR)$(BINDIR)/
+ install -m 0755 bcron-sched $(DESTDIR)$(BINDIR)/
+ install -m 0755 bcron-spool $(DESTDIR)$(BINDIR)/
+ install -m 0755 bcron-start $(DESTDIR)$(BINDIR)/
+ install -m 0755 bcron-update $(DESTDIR)$(BINDIR)/
+ install -m 0755 bcrontab $(DESTDIR)$(BINDIR)/
+ ln -snf bcrontab $(DESTDIR)$(BINDIR)/crontab
+ install -m 0644 bcrontab.1 $(DESTDIR)$(MAN1DIR)/
+ ln -snf bcrontab.1 $(DESTDIR)$(MAN1DIR)/crontab.1
+ install -m 0644 crontab.5 $(DESTDIR)$(MAN5DIR)/
+ install -m 0644 bcron-exec.8 $(DESTDIR)$(MAN8DIR)/
+ install -m 0644 bcron-sched.8 $(DESTDIR)$(MAN8DIR)/
+ install -m 0644 bcron-spool.8 $(DESTDIR)$(MAN8DIR)/
+ install -m 0644 bcron-start.8 $(DESTDIR)$(MAN8DIR)/
+ install -m 0644 bcron-update.8 $(DESTDIR)$(MAN8DIR)/
job.o: compile job.c bcron.h
./compile job.c

31
base/bcron/bcron-0.10-no-python.patch
Unescape View File

@ -0,0 +1,31 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../bcron/bcron-0.10-no-python.patch
# Copyright (C) 2013 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
Do not use python for generating 'conf_sendmail.c' from 'conf-sendmail'
--- a/Makefile 2013-04-18 13:32:07.380724339 +0200
+++ b/Makefile 2013-04-18 13:32:23.460768578 +0200
@@ -90,7 +90,9 @@
chmod 755 compile
conf_sendmail.c: conf-sendmail
- python -c 'import shlex; line=shlex.split(open("conf-sendmail").readline().strip()); print "const char* sendmail[] = { "+",".join(["\"%s\""%a for a in line])+",NULL };"' >conf_sendmail.c
+ ( confsendmail=`head -n 1 conf-sendmail | tr -s ' '`; \
+ printf "const char* sendmail[] = { `for x in $${confsendmail}; do printf '\"%s\",' $${x}; done`NULL };\n" \
+ ) >conf_sendmail.c
connection.o: compile connection.c bcron.h
./compile connection.c

5
base/bcron/bcron.conf
Unescape View File

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../bcron/bcron.conf
# Copyright (C) 2006 - 2010 The OpenSDE Project
# Copyright (C) 2006 - 2013 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
@ -30,7 +30,8 @@ bcron_bglibsconf() {
# to get rid of the ./installer we patched the makefile to use
# normal installing procedures
var_append makeinstopt ' ' BINDIR=$root$bindir
var_append makeinstopt ' ' "DESTDIR=$root"
var_append makeinstopt ' ' "PREFIX=/$prefix"
bcron_prepare() {
local spool=$root/var/spool/cron

6
base/bcron/bcron.desc
Unescape View File

@ -2,7 +2,7 @@
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY]
[COPY] Filename: package/.../bcron/bcron.desc
[COPY] Copyright (C) 2006 The OpenSDE Project
[COPY] Copyright (C) 2006 - 2013 The OpenSDE Project
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
[COPY]
[COPY] More information can be found in the files COPYING and README.
@ -32,8 +32,8 @@
[L] GPL
[S] Stable
[V] 0.09
[V] 0.10
[P] O -----5---9 210.000
[D] 3440190937 bcron-0.09.tar.gz http://untroubled.org/bcron/
[D] 2997335370 bcron-0.10.tar.gz http://untroubled.org/bcron/

27
base/bcron/initgroups.patch
Unescape View File

@ -1,27 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../bcron/initgroups.patch
# Copyright (C) 2010 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- ./bcron-exec.c.orig 2010-11-03 14:24:21.000000000 +0100
+++ ./bcron-exec.c 2010-11-03 14:24:33.000000000 +0100
@@ -111,7 +111,7 @@
dup2(fdout, 1);
dup2(fdout, 2);
close(fdout);
- if (0 && initgroups(pw->pw_name, pw->pw_gid) != 0)
+ if (initgroups(pw->pw_name, pw->pw_gid) != 0)
die1sys(111, "Could not initgroups");
if (setgid(pw->pw_gid) != 0)
die1sys(111, "Could not setgid");

42
base/bcron/make_install.patch
Unescape View File

@ -1,42 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../bcron/make_install.patch
# Copyright (C) 2006 - 2008 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- ./Makefile.orig 2006-10-16 17:34:11.000000000 +0300
+++ ./Makefile 2006-10-16 17:53:32.000000000 +0300
@@ -3,6 +3,7 @@
# Generated by spac see http://untroubled.org/spac/
SHELL=/bin/sh
+BINDIR=/usr/local/bin
DEFAULT: all
@@ -89,8 +90,13 @@
docs: bcron.info bcron.html
install: installer instcheck
- ./installer
- ./instcheck
+ install -m 0755 bcron-exec $(BINDIR)/
+ install -m 0755 bcron-sched $(BINDIR)/
+ install -m 0755 bcron-spool $(BINDIR)/
+ install -m 0755 bcron-start $(BINDIR)/
+ install -m 0755 bcron-update $(BINDIR)/
+ install -m 0755 bcrontab $(BINDIR)/
+ ln -snf bcrontab $(BINDIR)/crontab
installer: load insthier.o
./load insthier -lbg-installer -lbg
Write Preview
Loading…
Cancel
Save