[Glibc-bsd-commits] r2848 - in trunk/freebsd-libs/debian: . patches

Petr Salinger ps-guest at alioth.debian.org
Mon Nov 16 20:51:11 UTC 2009 

Author: ps-guest
Date: 2009-11-16 20:51:10 +0000 (Mon, 16 Nov 2009)
New Revision: 2848

Added:
   trunk/freebsd-libs/debian/libnetgraph-dev.install
   trunk/freebsd-libs/debian/libnetgraph4.install
   trunk/freebsd-libs/debian/patches/11_netgraph.diff
Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/control
   trunk/freebsd-libs/debian/patches/10_memstat.diff
   trunk/freebsd-libs/debian/patches/series
   trunk/freebsd-libs/debian/rules
Log:
* add libnetgraph4 and libnetgraph-dev packages



Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2009-11-16 18:52:19 UTC (rev 2847)
+++ trunk/freebsd-libs/debian/changelog	2009-11-16 20:51:10 UTC (rev 2848)
@@ -7,6 +7,7 @@
     - libkiconv3   -> libkiconv4
     - libdevstat6  -> libdevstat7
   * add libmemstat3 and libmemstat-dev packages
+  * add libnetgraph4 and libnetgraph-dev packages
 
  -- Aurelien Jarno <aurel32 at debian.org>  Sat, 14 Nov 2009 10:41:06 +0100
 

Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control	2009-11-16 18:52:19 UTC (rev 2847)
+++ trunk/freebsd-libs/debian/control	2009-11-16 20:51:10 UTC (rev 2848)
@@ -123,6 +123,21 @@
  This package contains the header files and static library needed to
  compile applications that use libmemstat.
 
+Package: libnetgraph4
+Architecture: kfreebsd-i386 kfreebsd-amd64
+Depends: ${shlibs:Depends}
+Description: FreeBSD memstat (kernel interface) library
+ The netgraph library provides a uniform interface for accessing kernel netgraph
+ interface.
+
+Package: libnetgraph-dev
+Section: libdevel
+Architecture: kfreebsd-i386 kfreebsd-amd64
+Depends: libnetgraph4 (= ${binary:Version}), libc0.1-dev | libc-dev, libbsd-dev
+Description: Development files for libnetgraph
+ This package contains the header files and static library needed to
+ compile applications that use libnetgraph.
+
 Package: libipx2
 Architecture: kfreebsd-i386 kfreebsd-amd64
 Depends: ${shlibs:Depends}

Added: trunk/freebsd-libs/debian/libnetgraph-dev.install
===================================================================
--- trunk/freebsd-libs/debian/libnetgraph-dev.install	                        (rev 0)
+++ trunk/freebsd-libs/debian/libnetgraph-dev.install	2009-11-16 20:51:10 UTC (rev 2848)
@@ -0,0 +1,5 @@
+usr/include/netgraph.h
+usr/lib/libnetgraph*.so
+usr/lib/libnetgraph*.a
+usr/share/man/man3/netgraph.3.gz
+usr/share/man/man3/Ng*.3.gz

Added: trunk/freebsd-libs/debian/libnetgraph4.install
===================================================================
--- trunk/freebsd-libs/debian/libnetgraph4.install	                        (rev 0)
+++ trunk/freebsd-libs/debian/libnetgraph4.install	2009-11-16 20:51:10 UTC (rev 2848)
@@ -0,0 +1 @@
+usr/lib/libnetgraph*.so.*

Modified: trunk/freebsd-libs/debian/patches/10_memstat.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/10_memstat.diff	2009-11-16 18:52:19 UTC (rev 2847)
+++ trunk/freebsd-libs/debian/patches/10_memstat.diff	2009-11-16 20:51:10 UTC (rev 2848)
@@ -1,20 +1,20 @@
 Index: freebsd-libs/lib/libmemstat/memstat_internal.h
 ===================================================================
---- freebsd-libs.orig/lib/libmemstat/memstat_internal.h	2009-11-16 16:54:58.000000000 +0000
-+++ freebsd-libs/lib/libmemstat/memstat_internal.h	2009-11-16 16:58:21.000000000 +0000
-@@ -29,7 +29,7 @@
+--- freebsd-libs.orig/lib/libmemstat/memstat_internal.h	2009-11-16 20:42:38.000000000 +0000
++++ freebsd-libs/lib/libmemstat/memstat_internal.h	2009-11-16 20:42:39.000000000 +0000
+@@ -28,6 +28,8 @@
+ 
  #ifndef _MEMSTAT_INTERNAL_H_
  #define	_MEMSTAT_INTERNAL_H_
++ 
++#include <sys/queue.h> 
  
--
-+#include <sys/queue.h>
- 
  /*
   * memstat maintains its own internal notion of statistics on each memory
 Index: freebsd-libs/lib/libmemstat/memstat.h
 ===================================================================
---- freebsd-libs.orig/lib/libmemstat/memstat.h	2009-11-16 16:54:58.000000000 +0000
-+++ freebsd-libs/lib/libmemstat/memstat.h	2009-11-16 16:58:21.000000000 +0000
+--- freebsd-libs.orig/lib/libmemstat/memstat.h	2009-11-16 20:42:38.000000000 +0000
++++ freebsd-libs/lib/libmemstat/memstat.h	2009-11-16 20:42:39.000000000 +0000
 @@ -29,6 +29,8 @@
  #ifndef _MEMSTAT_H_
  #define	_MEMSTAT_H_
@@ -26,8 +26,8 @@
   * at least the value of MAXCPU from param.h.
 Index: freebsd-libs/lib/libmemstat/memstat_malloc.c
 ===================================================================
---- freebsd-libs.orig/lib/libmemstat/memstat_malloc.c	2009-11-16 16:54:58.000000000 +0000
-+++ freebsd-libs/lib/libmemstat/memstat_malloc.c	2009-11-16 16:58:21.000000000 +0000
+--- freebsd-libs.orig/lib/libmemstat/memstat_malloc.c	2009-11-16 20:42:38.000000000 +0000
++++ freebsd-libs/lib/libmemstat/memstat_malloc.c	2009-11-16 20:42:39.000000000 +0000
 @@ -44,10 +44,10 @@
  
  static struct nlist namelist[] = {
@@ -55,8 +55,8 @@
  {
 Index: freebsd-libs/lib/libmemstat/memstat_uma.c
 ===================================================================
---- freebsd-libs.orig/lib/libmemstat/memstat_uma.c	2009-11-16 16:54:58.000000000 +0000
-+++ freebsd-libs/lib/libmemstat/memstat_uma.c	2009-11-16 16:58:21.000000000 +0000
+--- freebsd-libs.orig/lib/libmemstat/memstat_uma.c	2009-11-16 20:42:38.000000000 +0000
++++ freebsd-libs/lib/libmemstat/memstat_uma.c	2009-11-16 20:42:39.000000000 +0000
 @@ -50,12 +50,12 @@
  
  static struct nlist namelist[] = {
@@ -76,8 +76,8 @@
  /*
 Index: freebsd-libs/lib/libmemstat/Makefile
 ===================================================================
---- freebsd-libs.orig/lib/libmemstat/Makefile	2009-11-16 16:59:54.000000000 +0000
-+++ freebsd-libs/lib/libmemstat/Makefile	2009-11-16 17:00:59.000000000 +0000
+--- freebsd-libs.orig/lib/libmemstat/Makefile	2009-11-16 20:42:38.000000000 +0000
++++ freebsd-libs/lib/libmemstat/Makefile	2009-11-16 20:42:39.000000000 +0000
 @@ -3,8 +3,9 @@
  WARNS?=		3
  LIB=		memstat

Added: trunk/freebsd-libs/debian/patches/11_netgraph.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/11_netgraph.diff	                        (rev 0)
+++ trunk/freebsd-libs/debian/patches/11_netgraph.diff	2009-11-16 20:51:10 UTC (rev 2848)
@@ -0,0 +1,67 @@
+Index: freebsd-libs/lib/libnetgraph/netgraph.h
+===================================================================
+--- freebsd-libs.orig/lib/libnetgraph/netgraph.h	2009-11-16 20:42:38.000000000 +0000
++++ freebsd-libs/lib/libnetgraph/netgraph.h	2009-11-16 20:42:39.000000000 +0000
+@@ -43,14 +43,15 @@
+ #ifndef _NETGRAPH_H_
+ #define _NETGRAPH_H_
+ 
++#include <stdint.h>
+ #include <sys/types.h>
+ #include <netgraph/ng_message.h>
+ 
+ __BEGIN_DECLS
+ int	NgMkSockNode(const char *, int *, int *);
+-int	NgNameNode(int, const char *, const char *, ...) __printflike(3, 4);
++int	NgNameNode(int, const char *, const char *, ...);
+ int	NgSendMsg(int, const char *, int, int, const void *, size_t);
+-int	NgSendAsciiMsg(int, const char *, const char *, ...) __printflike(3, 4);
++int	NgSendAsciiMsg(int, const char *, const char *, ...);
+ int	NgSendReplyMsg(int, const char *,
+ 		const struct ng_mesg *, const void *, size_t);
+ int	NgRecvMsg(int, struct ng_mesg *, size_t, char *);
+Index: freebsd-libs/lib/libnetgraph/sock.c
+===================================================================
+--- freebsd-libs.orig/lib/libnetgraph/sock.c	2009-11-16 20:42:38.000000000 +0000
++++ freebsd-libs/lib/libnetgraph/sock.c	2009-11-16 20:42:39.000000000 +0000
+@@ -44,6 +44,8 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <stdarg.h>
++#include <stdint.h>
++
+ #include <netgraph/ng_message.h>
+ #include <netgraph/ng_socket.h>
+ 
+Index: freebsd-libs/lib/libnetgraph/msg.c
+===================================================================
+--- freebsd-libs.orig/lib/libnetgraph/msg.c	2009-11-16 20:42:38.000000000 +0000
++++ freebsd-libs/lib/libnetgraph/msg.c	2009-11-16 20:42:39.000000000 +0000
+@@ -44,12 +44,15 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <stdarg.h>
++#include <stdint.h>
+ #include <netgraph/ng_message.h>
+ #include <netgraph/ng_socket.h>
+ 
+ #include "netgraph.h"
+ #include "internal.h"
+ 
++#define INFTIM          (-1)
++
+ /* Next message token value */
+ static int	gMsgId;
+ 
+Index: freebsd-libs/lib/libnetgraph/Makefile
+===================================================================
+--- freebsd-libs.orig/lib/libnetgraph/Makefile	2009-11-16 20:43:39.000000000 +0000
++++ freebsd-libs/lib/libnetgraph/Makefile	2009-11-16 20:44:22.000000000 +0000
+@@ -4,6 +4,7 @@
+ LIB=		netgraph
+ WARNS?=		3
+ MAN=		netgraph.3
++LDADD= -lbsd
+ 
+ SHLIB_MAJOR=	4
+ 

Modified: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series	2009-11-16 18:52:19 UTC (rev 2847)
+++ trunk/freebsd-libs/debian/patches/series	2009-11-16 20:51:10 UTC (rev 2848)
@@ -7,3 +7,4 @@
 08_libdevstat.diff
 09_libusbhid.diff
 10_memstat.diff
+11_netgraph.diff

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2009-11-16 18:52:19 UTC (rev 2847)
+++ trunk/freebsd-libs/debian/rules	2009-11-16 20:51:10 UTC (rev 2848)
@@ -31,8 +31,10 @@
 
 get-orig-source:
 	rm -rf $(ORIGDIR)
-	for i in lib/libcam lib/libdevstat lib/libgeom lib/libipx lib/libkiconv \
-	         lib/libkvm lib/libmemstat lib/libsbuf lib/libusb lib/libusbhid sys/cam ; do \
+	for i in lib/libcam lib/libdevstat lib/libgeom lib/libipx \
+	         lib/libkiconv lib/libnetgraph \
+	         lib/libkvm lib/libmemstat lib/libsbuf lib/libusb \
+	         lib/libusbhid sys/cam ; do \
 	    svn export $(SVN)/$$i $(ORIGDIR)/$$i ; \
 	done
 	mkdir -p freebsd-libs-$(VERSION)/sys/kern ; \
@@ -49,7 +51,7 @@
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	touch $@
 
-build-arch: build-cam build-geom build-sbuf build-ipx build-kiconv build-kvm build-usbhid build-devstat build-memstat
+build-arch: build-cam build-geom build-sbuf build-ipx build-kiconv build-kvm build-usbhid build-devstat build-memstat build-netgraph
 
 build-cam: build-cam-stamp
 build-cam-stamp: patch build-sbuf
@@ -61,6 +63,11 @@
 	$(PMAKE) -C $(CURDIR)/lib/libgeom
 	touch $@
 
+build-netgraph: build-netgraph-stamp
+build-netgraph-stamp: patch
+	$(PMAKE) -C $(CURDIR)/lib/libnetgraph
+	touch $@
+
 build-ipx: build-ipx-stamp
 build-ipx-stamp: patch
 	$(PMAKE) -C $(CURDIR)/lib/libipx
@@ -104,6 +111,7 @@
 	dh_testdir
 	dh_testroot
 	$(PMAKE) -C $(CURDIR)/lib/libcam clean
+	$(PMAKE) -C $(CURDIR)/lib/libnetgraph clean
 	$(PMAKE) -C $(CURDIR)/lib/libdevstat clean
 	$(PMAKE) -C $(CURDIR)/lib/libmemstat clean
 	$(PMAKE) -C $(CURDIR)/lib/libgeom clean
@@ -135,6 +143,7 @@
 	$(PMAKE) -C $(CURDIR)/lib/libkvm install
 	$(PMAKE) -C $(CURDIR)/lib/libdevstat install
 	$(PMAKE) -C $(CURDIR)/lib/libmemstat install
+	$(PMAKE) -C $(CURDIR)/lib/libnetgraph install
 	$(PMAKE) -C $(CURDIR)/lib/libusbhid install
 
 	dh_install -s --list-missing --sourcedir=debian/tmp

More information about the Glibc-bsd-commits mailing list