[Glibc-bsd-commits] r3845 - in trunk/freebsd-smbfs/debian: . patches

Robert Millan rmh at alioth.debian.org
Sat Nov 12 00:34:19 UTC 2011 

Author: rmh
Date: 2011-11-12 00:34:18 +0000 (Sat, 12 Nov 2011)
New Revision: 3845

Added:
   trunk/freebsd-smbfs/debian/patches/optreset.diff
   trunk/freebsd-smbfs/debian/patches/smbutil.diff
   trunk/freebsd-smbfs/debian/patches/uid_format.diff
Modified:
   trunk/freebsd-smbfs/debian/changelog
   trunk/freebsd-smbfs/debian/freebsd-smbfs.install
   trunk/freebsd-smbfs/debian/freebsd-smbfs.manpages
   trunk/freebsd-smbfs/debian/patches/makefile.diff
   trunk/freebsd-smbfs/debian/patches/series
   trunk/freebsd-smbfs/debian/rules
Log:
Add "smbutil".

Modified: trunk/freebsd-smbfs/debian/changelog
===================================================================
--- trunk/freebsd-smbfs/debian/changelog	2011-11-11 21:59:35 UTC (rev 3844)
+++ trunk/freebsd-smbfs/debian/changelog	2011-11-12 00:34:18 UTC (rev 3845)
@@ -1,8 +1,9 @@
 freebsd-smbfs (9.0~svn227117-2) UNRELEASED; urgency=low
 
   * Provide "smbfs".
+  * Add "smbutil".
 
- -- Robert Millan <rmh at debian.org>  Sun, 06 Nov 2011 21:37:19 +0100
+ -- Robert Millan <rmh at debian.org>  Sat, 12 Nov 2011 01:34:05 +0100
 
 freebsd-smbfs (9.0~svn227117-1) unstable; urgency=low
 

Modified: trunk/freebsd-smbfs/debian/freebsd-smbfs.install
===================================================================
--- trunk/freebsd-smbfs/debian/freebsd-smbfs.install	2011-11-11 21:59:35 UTC (rev 3844)
+++ trunk/freebsd-smbfs/debian/freebsd-smbfs.install	2011-11-12 00:34:18 UTC (rev 3845)
@@ -1,2 +1,4 @@
 usr.sbin/mount_smbfs/mount_smbfs	usr/sbin
+usr.bin/smbutil/smbutil			usr/bin
 etc/nsmb.conf				etc
+lib/libsmb/libsmb.so.*			usr/lib

Modified: trunk/freebsd-smbfs/debian/freebsd-smbfs.manpages
===================================================================
--- trunk/freebsd-smbfs/debian/freebsd-smbfs.manpages	2011-11-11 21:59:35 UTC (rev 3844)
+++ trunk/freebsd-smbfs/debian/freebsd-smbfs.manpages	2011-11-12 00:34:18 UTC (rev 3845)
@@ -1 +1,2 @@
+usr.bin/smbutil/smbutil.1.gz
 usr.sbin/mount_smbfs/mount_smbfs.8.gz

Modified: trunk/freebsd-smbfs/debian/patches/makefile.diff
===================================================================
--- trunk/freebsd-smbfs/debian/patches/makefile.diff	2011-11-11 21:59:35 UTC (rev 3844)
+++ trunk/freebsd-smbfs/debian/patches/makefile.diff	2011-11-12 00:34:18 UTC (rev 3845)
@@ -1,11 +1,26 @@
+--- a/usr.bin/smbutil/Makefile
++++ b/usr.bin/smbutil/Makefile
+@@ -6,6 +6,8 @@
+ DPADD=	${LIBSMB} ${LIBKICONV}
+ LDADD=	-lsmb -lkiconv
+ 
++LDADD+=	-L../../lib/libsmb
++
+ CONTRIBDIR=	${.CURDIR}/../../contrib/smbfs
+ CFLAGS+=	-I${CONTRIBDIR}/include
+ 
 --- a/usr.sbin/mount_smbfs/Makefile
 +++ b/usr.sbin/mount_smbfs/Makefile
-@@ -8,7 +8,7 @@
+@@ -8,9 +8,11 @@
  CONTRIBDIR=	${.CURDIR}/../../contrib/smbfs
  CFLAGS+=	-DSMBFS -I${MOUNTDIR} -I${CONTRIBDIR}/include
  
 -LDADD=	-lsmb -lkiconv
-+LDADD=	../../lib/libsmb/libsmb.a -lkiconv -ldl
++LDADD=	-lsmb -lkiconv -ldl
  DPADD=	${LIBSMB} ${LIBKICONV}
  
++LDADD+=	-L../../lib/libsmb
++
  # Needs to be dynamically linked for optional dlopen() access to
+ # userland libiconv (see the -E option).
+ #

Added: trunk/freebsd-smbfs/debian/patches/optreset.diff
===================================================================
--- trunk/freebsd-smbfs/debian/patches/optreset.diff	                        (rev 0)
+++ trunk/freebsd-smbfs/debian/patches/optreset.diff	2011-11-12 00:34:18 UTC (rev 3845)
@@ -0,0 +1,21 @@
+--- a/contrib/smbfs/smbutil/smbutil.c
++++ b/contrib/smbfs/smbutil/smbutil.c
+@@ -6,6 +6,7 @@
+ #include <stdlib.h>
+ #include <err.h>
+ #include <sysexits.h>
++#include <bsd/getopt.h>
+ 
+ #include <netsmb/smb_lib.h>
+ #include <netsmb/smb_conn.h>
+--- a/usr.bin/smbutil/Makefile
++++ b/usr.bin/smbutil/Makefile
+@@ -4,7 +4,7 @@
+ SRCS=	smbutil.c dumptree.c login.c lookup.c view.c print.c
+ 
+ DPADD=	${LIBSMB} ${LIBKICONV}
+-LDADD=	-lsmb -lkiconv
++LDADD=	-lsmb -lkiconv -lbsd
+ 
+ LDADD+=	-L../../lib/libsmb
+ 

Modified: trunk/freebsd-smbfs/debian/patches/series
===================================================================
--- trunk/freebsd-smbfs/debian/patches/series	2011-11-11 21:59:35 UTC (rev 3844)
+++ trunk/freebsd-smbfs/debian/patches/series	2011-11-12 00:34:18 UTC (rev 3845)
@@ -1,3 +1,4 @@
+smbutil.diff
 af_netbios.diff
 makefile.diff
 getvfsbyname.diff
@@ -2 +3,3 @@
 config_file.diff
+optreset.diff
+uid_format.diff

Added: trunk/freebsd-smbfs/debian/patches/smbutil.diff
===================================================================
--- trunk/freebsd-smbfs/debian/patches/smbutil.diff	                        (rev 0)
+++ trunk/freebsd-smbfs/debian/patches/smbutil.diff	2011-11-12 00:34:18 UTC (rev 3845)
@@ -0,0 +1,22 @@
+
+Import from upstream
+
+--- /dev/null
++++ b/usr.bin/smbutil/Makefile
+@@ -0,0 +1,16 @@
++# $FreeBSD$
++
++PROG=	smbutil
++SRCS=	smbutil.c dumptree.c login.c lookup.c view.c print.c
++
++DPADD=	${LIBSMB} ${LIBKICONV}
++LDADD=	-lsmb -lkiconv
++
++CONTRIBDIR=	${.CURDIR}/../../contrib/smbfs
++CFLAGS+=	-I${CONTRIBDIR}/include
++
++WARNS?=	0
++
++.PATH:	${CONTRIBDIR}/smbutil
++
++.include <bsd.prog.mk>

Added: trunk/freebsd-smbfs/debian/patches/uid_format.diff
===================================================================
--- trunk/freebsd-smbfs/debian/patches/uid_format.diff	                        (rev 0)
+++ trunk/freebsd-smbfs/debian/patches/uid_format.diff	2011-11-12 00:34:18 UTC (rev 3845)
@@ -0,0 +1,22 @@
+--- a/contrib/smbfs/smbutil/dumptree.c
++++ b/contrib/smbfs/smbutil/dumptree.c
+@@ -70,8 +70,7 @@
+ 	char buf[200];
+ 
+ 	printf("VC: \\\\%s\\%s\n", vip->srvname, vip->vcname);
+-	printf("(%s:%s) %o", user_from_uid(vip->uid, 0), 
+-	    group_from_gid(vip->gid, 0), vip->mode);
++	printf("(%u:%u) %o", vip->uid, vip->gid, vip->mode);
+ 	printf("\n");
+ 	if (!verbose)
+ 		return;
+@@ -93,8 +92,7 @@
+ 	char buf[200];
+ 
+ 	iprintf(4, "Share:    %s", sip->sname);
+-	printf("(%s:%s) %o", user_from_uid(sip->uid, 0), 
+-	    group_from_gid(sip->gid, 0), sip->mode);
++	printf("(%u:%u) %o", sip->uid, sip->gid, sip->mode);
+ 	printf("\n");
+ 	if (!verbose)
+ 		return;

Modified: trunk/freebsd-smbfs/debian/rules
===================================================================
--- trunk/freebsd-smbfs/debian/rules	2011-11-11 21:59:35 UTC (rev 3844)
+++ trunk/freebsd-smbfs/debian/rules	2011-11-12 00:34:18 UTC (rev 3845)
@@ -46,6 +46,7 @@
 	for i in \
 		contrib/smbfs \
 		usr.sbin/mount_smbfs \
+		usr.bin/smbutil \
 		lib/libsmb \
 		sbin/mount/{getmntopts.c,mntopts.h} \
 		etc/nsmb.conf \
@@ -71,13 +72,16 @@
 build-smbfs: build-smbfs-stamp
 build-smbfs-stamp: build-libsmb-stamp
 	$(PMAKE) -C $(CURDIR)/usr.sbin/mount_smbfs
+	$(PMAKE) -C $(CURDIR)/usr.bin/smbutil
 	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
 
+	$(PMAKE) -C $(CURDIR)/lib/libsmb clean
 	$(PMAKE) -C $(CURDIR)/usr.sbin/mount_smbfs clean
+	$(PMAKE) -C $(CURDIR)/usr.bin/smbutil clean
 
 	rm -f *stamp
 	dh_clean

More information about the Glibc-bsd-commits mailing list