[Pkg-citadel-commit] r52 - in citadel/trunk/debian: . patches

[dothebart-guest at alioth.debian.org]

Author: dothebart-guest
Date: 2008-04-14 21:22:18 +0000 (Mon, 14 Apr 2008)
New Revision: 52

Added:
   citadel/trunk/debian/patches/
   citadel/trunk/debian/patches/series
   citadel/trunk/debian/patches/setup_check_etc_services_env.diff
Modified:
   citadel/trunk/debian/changelog
   citadel/trunk/debian/citadel-server.postinst
   citadel/trunk/debian/control
   citadel/trunk/debian/rules
Log:
* add a patch to setup so it doesn't modify /etc/services if not explicitely told so
* added mechanics to have those patches aplied (the same as for webcit, hopefully done right?)


Modified: citadel/trunk/debian/changelog
===================================================================
--- citadel/trunk/debian/changelog	2008-04-14 16:31:57 UTC (rev 51)
+++ citadel/trunk/debian/changelog	2008-04-14 21:22:18 UTC (rev 52)
@@ -2,6 +2,7 @@
 
   [ Wilfried Goesgens ]
   * Removed stress binary, closes: #475967 
+  * add upstreams patch to non-taint /etc/services. closes: #475539
 
   [ Michael Meskes ]
   * Added French translation, closes: #474533

Modified: citadel/trunk/debian/citadel-server.postinst
===================================================================
--- citadel/trunk/debian/citadel-server.postinst	2008-04-14 16:31:57 UTC (rev 51)
+++ citadel/trunk/debian/citadel-server.postinst	2008-04-14 21:22:18 UTC (rev 52)
@@ -36,6 +36,7 @@
         export CREATE_XINETD_ENTRY=no
         export CREATE_INITTAB_ENTRY=no
         export NO_INIT_SCRIPTS=yes
+	export ALTER_ETC_SERVICES=yes
         echo "applying your settings."
         /usr/lib/citadel-server/setup -q
 

Modified: citadel/trunk/debian/control
===================================================================
--- citadel/trunk/debian/control	2008-04-14 16:31:57 UTC (rev 51)
+++ citadel/trunk/debian/control	2008-04-14 21:22:18 UTC (rev 52)
@@ -4,7 +4,7 @@
 Maintainer: Debian Citadel Team <pkg-citadel-devel at lists.alioth.debian.org>
 Uploaders: Wilfried Goesgens <w.goesgens at outgesourced.org>, Michael Meskes <meskes at debian.org>, Alexander Wirt <formorer at debian.org>
 Build-Depends: debhelper (>= 4), po-debconf, bison, autotools-dev,
- libdb-dev, libical-dev, libldap2-dev, libncurses5-dev,
+ libdb-dev, libical-dev, libldap2-dev, libncurses5-dev, quilt (>= 0.40),
  libpam0g-dev, libsieve2-dev, libssl-dev, libexpat1-dev, libcitadel-dev (>= 1.08)
 Standards-Version: 3.7.3
 

Added: citadel/trunk/debian/patches/series
===================================================================
--- citadel/trunk/debian/patches/series	                        (rev 0)
+++ citadel/trunk/debian/patches/series	2008-04-14 21:22:18 UTC (rev 52)
@@ -0,0 +1 @@
+setup_check_etc_services_env.diff

Added: citadel/trunk/debian/patches/setup_check_etc_services_env.diff
===================================================================
--- citadel/trunk/debian/patches/setup_check_etc_services_env.diff	                        (rev 0)
+++ citadel/trunk/debian/patches/setup_check_etc_services_env.diff	2008-04-14 21:22:18 UTC (rev 52)
@@ -0,0 +1,15 @@
+Index: setup.c
+===================================================================
+--- setup.c	(revision 6192)
++++ setup.c	(working copy)
+@@ -1237,7 +1237,9 @@
+ 	unlink("citadel.log");
+ 	unlink("weekly");
+ 
+-	check_services_entry();	/* Check /etc/services */
++	if (((setup_type == UI_SILENT) && (getenv("ALTER_ETC_SERVICES")!=NULL)) || 
++	    (setup_type != UI_SILENT))
++		check_services_entry();	/* Check /etc/services */
+ #ifndef __CYGWIN__
+ 	delete_inittab_entry();	/* Remove obsolete /etc/inittab entry */
+ 	check_xinetd_entry();	/* Check /etc/xinetd.d/telnet */

Modified: citadel/trunk/debian/rules
===================================================================
--- citadel/trunk/debian/rules	2008-04-14 16:31:57 UTC (rev 51)
+++ citadel/trunk/debian/rules	2008-04-14 21:22:18 UTC (rev 52)
@@ -3,6 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
+
 # This has to be exported to make some magic below work.
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -35,7 +37,7 @@
 endif
 
 configure: configure-stamp
-configure-stamp:
+configure-stamp: patch
 	dh_testdir
 
 	CFLAGS="$(CFLAGS)" ./configure \
@@ -72,7 +74,7 @@
 
 	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-arch-stamp build-indep-stamp configure-stamp