[Pkg-sysvinit-commits] r1874 - in sysvinit/trunk/debian: . patches

[Petter Reinholdtsen]

Author: pere
Date: 2010-04-23 20:38:17 +0000 (Fri, 23 Apr 2010)
New Revision: 1874

Removed:
   sysvinit/trunk/debian/patches/96_shutdown_acctoff.dpatch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/series
Log:
Drop 96_shutdown_acctoff.dpatch, now included upstream.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2010-04-23 20:34:50 UTC (rev 1873)
+++ sysvinit/trunk/debian/changelog	2010-04-23 20:38:17 UTC (rev 1874)
@@ -12,6 +12,7 @@
     - Drop 62_init_freebsdterm.dpatch, now included upstream.
     - Drop 70_compiler_warnings.dpatch, now included upstream.
     - Drop 94_fstab-decode.dpatch, now included upstream.
+    - Drop 96_shutdown_acctoff.dpatch, now included upstream.
     - Drop 97_init_starttest.dpatch, now included upstream.
     - Drop 98_installtarget.dpatch, now included upstream.
     - Update 63_init_keep_utf8_ttyflag.patch.

Deleted: sysvinit/trunk/debian/patches/96_shutdown_acctoff.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/96_shutdown_acctoff.dpatch	2010-04-23 20:34:50 UTC (rev 1873)
+++ sysvinit/trunk/debian/patches/96_shutdown_acctoff.dpatch	2010-04-23 20:38:17 UTC (rev 1874)
@@ -1,21 +0,0 @@
-Purpose: Debian accton require an argument since at least 2009-07-11.
-Authour: Petter Reinholdtsen
-Fixes:   #536574
-Status:  Applied upstream with a twist.
-
---- a/src/shutdown.c
-+++ b/src/shutdown.c
-@@ -331,7 +331,12 @@
- 	write_wtmp("shutdown", "~~", 0, RUN_LVL, "~~");
- 
- 	/* This is for those who have quota installed. */
--	spawn(1, "accton", NULL);
-+	spawn(1, "accton", "off", NULL);
-+/* This is an alternative way to disable accounting, saving a fork()
-+#if _BSD_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE < 500)
-+	if (acct(NULL)) perror("acct: ");
-+#endif
-+*/
- 	spawn(1, "quotaoff", "-a", NULL);
- 
- 	sync();

Modified: sysvinit/trunk/debian/patches/series
===================================================================
--- sysvinit/trunk/debian/patches/series	2010-04-23 20:34:50 UTC (rev 1873)
+++ sysvinit/trunk/debian/patches/series	2010-04-23 20:38:17 UTC (rev 1874)
@@ -2,4 +2,3 @@
 21_ifdown_kfreebsd.dpatch
 63_init_keep_utf8_ttyflag.patch
 91_sulogin_lockedpw.dpatch
-96_shutdown_acctoff.dpatch