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

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2014-09-20 21:05:04 +0000 (Sat, 20 Sep 2014)
New Revision: 5557

Added:
   trunk/freebsd-smbfs/debian/patches/strings.diff
   trunk/freebsd-smbfs/debian/patches/sys_mount.diff
Modified:
   trunk/freebsd-smbfs/debian/changelog
   trunk/freebsd-smbfs/debian/control
   trunk/freebsd-smbfs/debian/patches/makefile.diff
   trunk/freebsd-smbfs/debian/patches/series
Log:
* New upstream snapshot of 10.1-PRERELEASE
* Build-Depends on current kfreebsd-kernel-headers
* Remove patch smbutil.diff applied upstream:
* makefile.dif: refresh patch, drop unnecessary -ldl from libsmb
* strings.diff: new patch;  fix implicit declaration of strcmp due to
  possible typo


Modified: trunk/freebsd-smbfs/debian/changelog
===================================================================
--- trunk/freebsd-smbfs/debian/changelog	2014-09-20 21:03:41 UTC (rev 5556)
+++ trunk/freebsd-smbfs/debian/changelog	2014-09-20 21:05:04 UTC (rev 5557)
@@ -1,3 +1,15 @@
+freebsd-smbfs (10.1~svn271306-1) UNRELEASED; urgency=medium
+
+  [ Steven Chamberlain ]
+  * New upstream snapshot of 10.1-PRERELEASE
+  * Build-Depends on current kfreebsd-kernel-headers
+  * Remove patch smbutil.diff applied upstream:
+  * makefile.dif: refresh patch, drop unnecessary -ldl from libsmb
+  * strings.diff: new patch;  fix implicit declaration of strcmp due to
+    possible typo
+
+ -- GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>  Sat, 20 Sep 2014 21:16:22 +0100
+
 freebsd-smbfs (9.0~svn227117-3) unstable; urgency=low
 
   [ Guillem Jover ]

Modified: trunk/freebsd-smbfs/debian/control
===================================================================
--- trunk/freebsd-smbfs/debian/control	2014-09-20 21:03:41 UTC (rev 5556)
+++ trunk/freebsd-smbfs/debian/control	2014-09-20 21:05:04 UTC (rev 5557)
@@ -5,7 +5,7 @@
 Uploaders: Robert Millan <rmh at debian.org>
 Build-Depends: debhelper (>= 7.0.50~),
  freebsd-buildutils,
- kfreebsd-kernel-headers (>= 0.59),
+ kfreebsd-kernel-headers (>= 10.1~),
  libkiconv-dev,
  libbsd-dev,
  libc0.1-dev (>= 2.13-8),

Modified: trunk/freebsd-smbfs/debian/patches/makefile.diff
===================================================================
--- trunk/freebsd-smbfs/debian/patches/makefile.diff	2014-09-20 21:03:41 UTC (rev 5556)
+++ trunk/freebsd-smbfs/debian/patches/makefile.diff	2014-09-20 21:05:04 UTC (rev 5557)
@@ -21,17 +21,6 @@
  
 +LDADD+=	-L../../lib/libsmb
 +
- # Needs to be dynamically linked for optional dlopen() access to
- # userland libiconv (see the -E option).
- #
---- a/lib/libsmb/Makefile
-+++ b/lib/libsmb/Makefile
-@@ -6,7 +6,7 @@
- LIB=	smb
- SHLIB_MAJOR=	4
- DPADD=	${LIBKICONV}
--LDADD=	-lkiconv
-+LDADD=	-lkiconv -ldl
+ .PATH:	${CONTRIBDIR}/mount_smbfs
+ .PATH:  ${MOUNTDIR}
  
- SRCS=	rcfile.c ctx.c cfopt.c subr.c nls.c rap.c mbuf.c rq.c file.c \
- 	print.c \

Modified: trunk/freebsd-smbfs/debian/patches/series
===================================================================
--- trunk/freebsd-smbfs/debian/patches/series	2014-09-20 21:03:41 UTC (rev 5556)
+++ trunk/freebsd-smbfs/debian/patches/series	2014-09-20 21:05:04 UTC (rev 5557)
@@ -1,6 +1,7 @@
-smbutil.diff
 af_netbios.diff
 makefile.diff
 config_file.diff
 optreset.diff
 uid_format.diff
+sys_mount.diff
+strings.diff

Added: trunk/freebsd-smbfs/debian/patches/strings.diff
===================================================================
--- trunk/freebsd-smbfs/debian/patches/strings.diff	                        (rev 0)
+++ trunk/freebsd-smbfs/debian/patches/strings.diff	2014-09-20 21:05:04 UTC (rev 5557)
@@ -0,0 +1,15 @@
+From: Steven Chamberlain <steven at pyro.eu.org
+Subject: fix implicit declaration of strcmp due to possible typo
+Forwarded: no
+
+--- a/contrib/smbfs/smbutil/print.c
++++ b/contrib/smbfs/smbutil/print.c
+@@ -42,7 +42,7 @@
+ #include <fcntl.h>
+ #include <stdio.h>
+ #include <unistd.h>
+-#include <strings.h>
++#include <string.h>
+ #include <stdlib.h>
+ #include <sysexits.h>
+ 

Added: trunk/freebsd-smbfs/debian/patches/sys_mount.diff
===================================================================
--- trunk/freebsd-smbfs/debian/patches/sys_mount.diff	                        (rev 0)
+++ trunk/freebsd-smbfs/debian/patches/sys_mount.diff	2014-09-20 21:05:04 UTC (rev 5557)
@@ -0,0 +1,13 @@
+--- a/sbin/mount/mntopts.h
++++ b/sbin/mount/mntopts.h
+@@ -74,6 +74,10 @@
+ 	MOPT_RW,							\
+ 	MOPT_AUTO
+ 
++#ifndef MNT_AUTOMOUNTED
++#define	MNT_AUTOMOUNTED	0x0000000200000000ULL	/* mounted by automountd(8) */
++#endif
++
+ /* Standard options which all mounts can understand. */
+ #define MOPT_STDOPTS							\
+ 	MOPT_USERQUOTA,							\