[Pkg-cron-devel] [SCM] Git repository for pkg-cron branch, sf3, updated. debian/3.0pl1-109-20-gde88d23
Christian Kastner
debian at kvr.at
Sat Sep 24 22:26:46 UTC 2011
The following commit has been merged in the sf3 branch:
commit ddcca1890e33efefa8d362d9b23972a5a02ac7ce
Author: Christian Kastner <debian at kvr.at>
Date: Sat Sep 24 23:43:18 2011 +0200
Allow overriding of the debugging feature
diff --git a/debian/patches/features/better-debugging-support b/debian/patches/features/better-debugging-support
index b2e8540..c1455fe 100644
--- a/debian/patches/features/better-debugging-support
+++ b/debian/patches/features/better-debugging-support
@@ -1,28 +1,29 @@
Subject: Better debugging support
-Last-Update: 2010-04-11
-Extend debugging options, etc...
-Index: patched/Makefile
+Extend debugging options, etc.
+
+Last-Update: 2011-09-24
+Index: sf3/Makefile
===================================================================
---- patched.orig/Makefile 2010-05-06 18:18:21.821436206 +0200
-+++ patched/Makefile 2010-05-06 18:18:44.879435811 +0200
+--- sf3.orig/Makefile 2011-09-24 00:42:12.780004764 +0200
++++ sf3/Makefile 2011-09-24 00:43:14.972004765 +0200
@@ -71,9 +71,10 @@
#<<want to use a nonstandard CC?>>
#CC = vcc
#<<manifest defines>>
-DEFS =
+# Allow override from command line
-+DEBUG_DEFS = -DDEBUGGING=0
++DEBUG_DEFS ?= -DDEBUGGING=0
# The -DUSE_SIGCHLD is needed for the Alpha port
-DEFS = -DDEBIAN -DUSE_SIGCHLD
+DEFS = -DDEBIAN -DUSE_SIGCHLD $(DEBUG_DEFS)
#(SGI IRIX systems need this)
#DEFS = -D_BSD_SIGNALS -Dconst=
#<<the name of the BSD-like install program>>
-Index: patched/config.h
+Index: sf3/config.h
===================================================================
---- patched.orig/config.h 2010-05-06 18:18:31.635435778 +0200
-+++ patched/config.h 2010-05-06 18:18:44.880437493 +0200
+--- sf3.orig/config.h 2011-09-24 00:43:01.272004780 +0200
++++ sf3/config.h 2011-09-24 00:43:11.420004765 +0200
@@ -29,6 +29,7 @@
*/
@@ -31,10 +32,10 @@ Index: patched/config.h
#define DEBUGGING 1 /* 1 or 0 -- do you want debugging code built in? */
#endif
-Index: patched/cron.c
+Index: sf3/cron.c
===================================================================
---- patched.orig/cron.c 2010-05-06 18:18:38.503560917 +0200
-+++ patched/cron.c 2010-05-06 18:18:44.880437493 +0200
+--- sf3.orig/cron.c 2011-09-24 00:43:10.884004761 +0200
++++ sf3/cron.c 2011-09-24 00:43:11.420004765 +0200
@@ -48,7 +48,16 @@
static void
@@ -53,10 +54,10 @@ Index: patched/cron.c
exit(ERROR_EXIT);
}
-Index: patched/crontab.c
+Index: sf3/crontab.c
===================================================================
---- patched.orig/crontab.c 2010-05-06 18:18:43.421561039 +0200
-+++ patched/crontab.c 2010-05-06 18:18:44.880437493 +0200
+--- sf3.orig/crontab.c 2011-09-24 00:43:11.288004766 +0200
++++ sf3/crontab.c 2011-09-24 00:43:11.420004765 +0200
@@ -148,6 +148,12 @@
/*NOTREACHED*/
}
diff --git a/debian/patches/features/pam-support b/debian/patches/features/pam-support
index 3311a65..59dc4aa 100644
--- a/debian/patches/features/pam-support
+++ b/debian/patches/features/pam-support
@@ -8,10 +8,10 @@ Bug-Debian: https://bugs.debian.org/68366
Bug-Debian: https://bugs.debian.org/67586
Bug-Debian: https://bugs.debian.org/70028
Bug-Debian: https://bugs.debian.org/75408
-Index: orig/Makefile
+Index: sf3/Makefile
===================================================================
---- orig.orig/Makefile 2011-01-07 17:15:44.703639257 +0100
-+++ orig/Makefile 2011-01-07 17:15:52.255639867 +0100
+--- sf3.orig/Makefile 2011-09-24 00:45:09.088004768 +0200
++++ sf3/Makefile 2011-09-24 00:45:09.232004762 +0200
@@ -55,7 +55,7 @@
INCLUDE = -I.
#INCLUDE =
@@ -23,17 +23,17 @@ Index: orig/Makefile
#OPTIM = -g
@@ -74,7 +74,7 @@
# Allow override from command line
- DEBUG_DEFS = -DDEBUGGING=0
+ DEBUG_DEFS ?= -DDEBUGGING=0
# The -DUSE_SIGCHLD is needed for the Alpha port
-DEFS = -DDEBIAN -DUSE_SIGCHLD $(DEBUG_DEFS)
+DEFS = -DDEBIAN -DUSE_SIGCHLD $(DEBUG_DEFS) $(PAM_DEFS)
#(SGI IRIX systems need this)
#DEFS = -D_BSD_SIGNALS -Dconst=
#<<the name of the BSD-like install program>>
-Index: orig/do_command.c
+Index: sf3/do_command.c
===================================================================
---- orig.orig/do_command.c 2011-01-07 17:15:44.751637030 +0100
-+++ orig/do_command.c 2011-01-07 17:15:52.255639867 +0100
+--- sf3.orig/do_command.c 2011-09-24 00:45:08.968004765 +0200
++++ sf3/do_command.c 2011-09-24 00:45:13.536004766 +0200
@@ -29,6 +29,18 @@
#if defined(SYSLOG)
# include <syslog.h>
diff --git a/debian/patches/features/selinux-support b/debian/patches/features/selinux-support
index a958776..0aa9062 100644
--- a/debian/patches/features/selinux-support
+++ b/debian/patches/features/selinux-support
@@ -11,10 +11,10 @@ Bug-Debian: http://bugs.debian.org/324017
Bug-Debian: http://bugs.debian.org/325404
Bug-Debian: http://bugs.debian.org/361458
Bug-Debian: http://bugs.debian.org/383857
-Index: patched/Makefile
+Index: sf3/Makefile
===================================================================
---- patched.orig/Makefile 2010-05-06 18:18:47.436487807 +0200
-+++ patched/Makefile 2010-05-06 18:18:48.837561139 +0200
+--- sf3.orig/Makefile 2011-09-24 00:45:09.232004762 +0200
++++ sf3/Makefile 2011-09-24 00:45:26.952004765 +0200
@@ -55,7 +55,7 @@
INCLUDE = -I.
#INCLUDE =
@@ -26,17 +26,17 @@ Index: patched/Makefile
#OPTIM = -g
@@ -74,7 +74,7 @@
# Allow override from command line
- DEBUG_DEFS = -DDEBUGGING=0
+ DEBUG_DEFS ?= -DDEBUGGING=0
# The -DUSE_SIGCHLD is needed for the Alpha port
-DEFS = -DDEBIAN -DUSE_SIGCHLD $(DEBUG_DEFS) $(PAM_DEFS)
+DEFS = -DDEBIAN -DUSE_SIGCHLD $(DEBUG_DEFS) $(PAM_DEFS) $(SELINUX_DEFS)
#(SGI IRIX systems need this)
#DEFS = -D_BSD_SIGNALS -Dconst=
#<<the name of the BSD-like install program>>
-Index: patched/cron.h
+Index: sf3/cron.h
===================================================================
---- patched.orig/cron.h 2010-05-06 18:18:30.896560600 +0200
-+++ patched/cron.h 2010-05-06 18:18:48.838561166 +0200
+--- sf3.orig/cron.h 2011-09-24 00:44:49.084004757 +0200
++++ sf3/cron.h 2011-09-24 00:45:26.952004765 +0200
@@ -40,6 +40,13 @@
#include "config.h"
#include "externs.h"
@@ -70,10 +70,10 @@ Index: patched/cron.h
*find_user __P((cron_db *, char *));
entry *load_entry __P((FILE *, void (*)(),
-Index: patched/database.c
+Index: sf3/database.c
===================================================================
---- patched.orig/database.c 2010-05-06 18:18:36.431560887 +0200
-+++ patched/database.c 2010-05-06 18:18:48.838561166 +0200
+--- sf3.orig/database.c 2011-09-24 00:44:49.792004766 +0200
++++ sf3/database.c 2011-09-24 00:45:26.952004765 +0200
@@ -97,7 +97,7 @@
new_db.head = new_db.tail = NULL;
@@ -93,10 +93,10 @@ Index: patched/database.c
if (u != NULL) {
u->mtime = statbuf->st_mtime;
link_user(new_db, u);
-Index: patched/do_command.c
+Index: sf3/do_command.c
===================================================================
---- patched.orig/do_command.c 2010-05-06 18:18:48.182560885 +0200
-+++ patched/do_command.c 2010-05-06 18:18:48.877435845 +0200
+--- sf3.orig/do_command.c 2011-09-24 00:45:20.888004765 +0200
++++ sf3/do_command.c 2011-09-24 00:45:26.952004765 +0200
@@ -42,6 +42,11 @@
}
#endif
@@ -133,10 +133,10 @@ Index: patched/do_command.c
execle(shell, shell, "-c", e->cmd, (char *)0, jobenv);
fprintf(stderr, "%s: execle: %s\n", shell, strerror(errno));
_exit(ERROR_EXIT);
-Index: patched/user.c
+Index: sf3/user.c
===================================================================
---- patched.orig/user.c 2010-05-06 18:18:32.328436004 +0200
-+++ patched/user.c 2010-05-06 18:18:48.877435845 +0200
+--- sf3.orig/user.c 2011-09-24 00:44:49.276004772 +0200
++++ sf3/user.c 2011-09-24 00:45:26.952004765 +0200
@@ -25,6 +25,107 @@
#include "cron.h"
--
Git repository for pkg-cron
More information about the Pkg-cron-devel
mailing list