[Glibc-bsd-commits] r1923 - in trunk: freebsd-utils/debian web/patches

[ps-guest at alioth.debian.org]

Author: ps-guest
Date: 2007-05-14 11:32:46 +0000 (Mon, 14 May 2007)
New Revision: 1923

Removed:
   trunk/web/patches/net-snmp.diff
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/freebsd-utils.init.d
   trunk/freebsd-utils/debian/kbdcontrol.init.d
   trunk/freebsd-utils/debian/module-init-tools.init.d
Log:
* fixes by Jerome Warnier <jwarnier at beeznest.net>



Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2007-05-14 09:44:30 UTC (rev 1922)
+++ trunk/freebsd-utils/debian/changelog	2007-05-14 11:32:46 UTC (rev 1923)
@@ -1,3 +1,10 @@
+freebsd-utils (6.2-4) UNRELEASED; urgency=low
+
+  [ Jerome Warnier ]
+  * fixup in init.d scripts
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sat, 24 Mar 2007 20:48:28 +0100
+
 freebsd-utils (6.2-3) unreleased; urgency=low
 
   [ Petr Salinger ]

Modified: trunk/freebsd-utils/debian/freebsd-utils.init.d
===================================================================
--- trunk/freebsd-utils/debian/freebsd-utils.init.d	2007-05-14 09:44:30 UTC (rev 1922)
+++ trunk/freebsd-utils/debian/freebsd-utils.init.d	2007-05-14 11:32:46 UTC (rev 1923)
@@ -90,7 +90,7 @@
     ;; 
 
   *)
-      echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2
+      echo "Usage: $0 {start|stop|restart|force-reload}" >&2
       exit 1
       ;;
 esac

Modified: trunk/freebsd-utils/debian/kbdcontrol.init.d
===================================================================
--- trunk/freebsd-utils/debian/kbdcontrol.init.d	2007-05-14 09:44:30 UTC (rev 1922)
+++ trunk/freebsd-utils/debian/kbdcontrol.init.d	2007-05-14 11:32:46 UTC (rev 1923)
@@ -44,7 +44,7 @@
 	# No-op
 	;;
   *)
-	echo "Usage: mountall.sh [start|stop]" >&2
+	echo "Usage: $0 [start|stop]" >&2
 	exit 3
 	;;
 esac

Modified: trunk/freebsd-utils/debian/module-init-tools.init.d
===================================================================
--- trunk/freebsd-utils/debian/module-init-tools.init.d	2007-05-14 09:44:30 UTC (rev 1922)
+++ trunk/freebsd-utils/debian/module-init-tools.init.d	2007-05-14 11:32:46 UTC (rev 1923)
@@ -28,8 +28,9 @@
 		which kld$i >/dev/null || exit 1
 	done
 	modules="`shopt -s nullglob ; cat /etc/modules /etc/modules.d/* \
-		 | sed -e \"s/#.*//g\" -e \"/^\( \|\t\)*$/d\" | sort | uniq`"
-
+		 | sed -e \"s/#.*//g\" -e \"/^\( \|\t\)*$/d\" `"
+#			in previous line should be output of sed passed 
+#			through  "| sort -u", but sort is located in /usr/bin/ :-(
 	set -e
 
 	for i in ${modules} ; do
@@ -55,7 +56,7 @@
 	# No-op
 	;;
   *)
-	echo "Usage: mountall.sh [start|stop]" >&2
+	echo "Usage: $0 [start|stop]" >&2
 	exit 3
 	;;
 esac

Deleted: trunk/web/patches/net-snmp.diff
===================================================================
--- trunk/web/patches/net-snmp.diff	2007-05-14 09:44:30 UTC (rev 1922)
+++ trunk/web/patches/net-snmp.diff	2007-05-14 11:32:46 UTC (rev 1923)
@@ -1,19 +0,0 @@
-diff -u net-snmp-5.3.1/debian/patches/26_kfreebsd.patch net-snmp-5.3.1/debian/patches/26_kfreebsd.patch
---- net-snmp-5.3.1/debian/patches/26_kfreebsd.patch
-+++ net-snmp-5.3.1/debian/patches/26_kfreebsd.patch
-@@ -34,7 +34,7 @@
- unchanged:
- --- net-snmp-5.3.1.orig/include/net-snmp/system/kfreebsd.h
- +++ net-snmp-5.3.1/include/net-snmp/system/kfreebsd.h
--@@ -0,0 +1,71 @@
-+@@ -0,0 +1,65 @@
- +#include "freebsd6.h"
- +#define freebsd6
- +
-@@ -103,6 +102,0 @@
--+/* Segment flag values. */
--+enum uio_seg {
--+        UIO_USERSPACE,          /* from user data space */
--+        UIO_SYSSPACE,           /* from system space */
--+        UIO_NOCOPY              /* don't copy, already in object */
--+};