[Glibc-bsd-commits] r2058 - in trunk/freebsd-utils/debian: . patches

[ps-guest at alioth.debian.org]

Author: ps-guest
Date: 2007-12-04 16:39:17 +0000 (Tue, 04 Dec 2007)
New Revision: 2058

Added:
   trunk/freebsd-utils/debian/patches/016_mdconfig.diff
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/patches/015_pf.diff
   trunk/freebsd-utils/debian/patches/series
Log:
* freebsd-utils based on upcoming FreeBSD 6.3



Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2007-12-03 22:36:12 UTC (rev 2057)
+++ trunk/freebsd-utils/debian/changelog	2007-12-04 16:39:17 UTC (rev 2058)
@@ -2,7 +2,7 @@
 
   [ Petr Salinger ]
   * Add build-dependency on quilt, and use quilt in debian/rules
-  * Based on kfreebsd-source-6.3
+  * Based on FreeBSD 6.3
   * Fixup in init.d scripts, suggested by Jerome Warnier
   * Adjust start level of kbdcontrol, suggested by Jerome Warnier
   * Do not use "exec -a", suggested by Thorsten Glaser

Modified: trunk/freebsd-utils/debian/patches/015_pf.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/015_pf.diff	2007-12-03 22:36:12 UTC (rev 2057)
+++ trunk/freebsd-utils/debian/patches/015_pf.diff	2007-12-04 16:39:17 UTC (rev 2058)
@@ -125,13 +125,18 @@
  #include <netinet/icmp6.h>
  #include <net/pfvar.h>
  #include <arpa/inet.h>
-@@ -58,6 +58,9 @@
+@@ -58,6 +58,14 @@
  #include <err.h>
  #include <ifaddrs.h>
  
 +#include <bsd/ip_icmp.h>
 +#include <bsd/bsd.h>
 +
++/* RFC2292 decls */
++#define ICMP6_MEMBERSHIP_QUERY          130     /* group membership query */
++#define ICMP6_MEMBERSHIP_REPORT         131     /* group membership report */
++#define ICMP6_MEMBERSHIP_REDUCTION      132     /* group membership termination */
++#define ICMP6_DST_UNREACH_NOTNEIGHBOR 2 /* not a neighbor(obsolete) */
  #include "pfctl_parser.h"
  #include "pfctl.h"
  

Added: trunk/freebsd-utils/debian/patches/016_mdconfig.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/016_mdconfig.diff	                        (rev 0)
+++ trunk/freebsd-utils/debian/patches/016_mdconfig.diff	2007-12-04 16:39:17 UTC (rev 2058)
@@ -0,0 +1,47 @@
+
+* revert change from 1.43.2.4 to 1.43.2.5 
+  it expects kld_isloaded() and kld_load() in libutil
+
+--- src/sbin/mdconfig/mdconfig.c
++++ src/sbin/mdconfig/mdconfig.c
+@@ -29,6 +29,7 @@
+ #include <sys/stat.h>
+ 
+ int	 list(const int);
++void	 mdmaybeload(void);
+ int	 query(const int, const int);
+ void	 usage(void);
+ 
+@@ -238,9 +239,7 @@
+ 	}
+ 	mdio.md_version = MDIOVERSION;
+ 
+-	if (!kld_isloaded("g_md") && kld_load("geom_md") == -1)
+-		err(1, "failed to load geom_md module");
+-
++	mdmaybeload();
+ 	fd = open("/dev/" MDCTL_NAME, O_RDWR, 0);
+ 	if (fd < 0)
+ 		err(1, "open(/dev/%s)", MDCTL_NAME);
+@@ -356,3 +355,21 @@
+ 
+ 	return (0);
+ }
++
++void
++mdmaybeload(void)
++{
++	char name1[64], name2[64];
++
++	snprintf(name1, sizeof(name1), "g_%s", MD_NAME);
++	snprintf(name2, sizeof(name2), "geom_%s", MD_NAME);
++	if (modfind(name1) == -1) {
++		/* Not present in kernel, try loading it. */
++		if (kldload(name2) == -1 || modfind(name1) == -1) {
++			if (errno != EEXIST) {
++				errx(EXIT_FAILURE,
++				    "%s module not available!", name2);
++			}
++		}
++	}
++}

Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series	2007-12-03 22:36:12 UTC (rev 2057)
+++ trunk/freebsd-utils/debian/patches/series	2007-12-04 16:39:17 UTC (rev 2058)
@@ -13,3 +13,4 @@
 013_mount_microshit.diff
 014_kldconfig.diff
 015_pf.diff
+016_mdconfig.diff