diff --git a/base/bcron/bcron-0.10-make-install.patch b/base/bcron/bcron-0.10-make-install.patch new file mode 100644 index 000000000..d68c970f6 --- /dev/null +++ b/base/bcron/bcron-0.10-make-install.patch @@ -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 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 diff --git a/base/bcron/bcron.conf b/base/bcron/bcron.conf index a9ffd9572..9ddcbf1f6 100644 --- a/base/bcron/bcron.conf +++ b/base/bcron/bcron.conf @@ -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 diff --git a/base/bcron/bcron.desc b/base/bcron/bcron.desc index ab4b787e9..715bb1dae 100644 --- a/base/bcron/bcron.desc +++ b/base/bcron/bcron.desc @@ -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/ diff --git a/base/bcron/initgroups.patch b/base/bcron/initgroups.patch deleted file mode 100644 index 5f3cae944..000000000 --- a/base/bcron/initgroups.patch +++ /dev/null @@ -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"); diff --git a/base/bcron/make_install.patch b/base/bcron/make_install.patch deleted file mode 100644 index 2cc5a19ef..000000000 --- a/base/bcron/make_install.patch +++ /dev/null @@ -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