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

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-12-01 12:32:11 +0000 (Sun, 01 Dec 2013)
New Revision: 5208

Removed:
   trunk/freebsd-utils/debian/patches/043_ppp.diff
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/patches/makefiles.diff
   trunk/freebsd-utils/debian/patches/series
Log:
Remove kludge in ppp(8) to use liblockdev. Use libutil directly like upstream does.  (Closes: 728019)

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2013-12-01 12:20:02 UTC (rev 5207)
+++ trunk/freebsd-utils/debian/changelog	2013-12-01 12:32:11 UTC (rev 5208)
@@ -13,6 +13,8 @@
     login_cap.h dependency instead.
   * Require freebsd-glue >= 0.2.4 to ensure trimdomain from libutil is
     used (rather than the static version in freebsd-glue << 0.2.4).
+  * Remove kludge in ppp(8) to use liblockdev. Use libutil directly like
+    upstream does.  (Closes: 728019)
 
   [ Guillem Jover ]
   * Remove myself from Uploaders.

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2013-12-01 12:20:02 UTC (rev 5207)
+++ trunk/freebsd-utils/debian/control	2013-12-01 12:32:11 UTC (rev 5208)
@@ -40,9 +40,7 @@
  libjail-dev,
 # libssl-dev: geom
  libssl-dev,
-# liblockdev1-dev: ppp
- liblockdev1-dev,
-# jail
+# jail, ppp
  libutil-freebsd-dev,
 Build-Conflicts:
 # /usr/include/bits symlink breaks usr.bin/kdump/{mkioctls,mksubr}

Deleted: trunk/freebsd-utils/debian/patches/043_ppp.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/043_ppp.diff	2013-12-01 12:20:02 UTC (rev 5207)
+++ trunk/freebsd-utils/debian/patches/043_ppp.diff	2013-12-01 12:32:11 UTC (rev 5208)
@@ -1,79 +0,0 @@
---- a/usr.sbin/ppp/bundle.c
-+++ b/usr.sbin/ppp/bundle.c
-@@ -1629,7 +1629,11 @@
-         log_Printf(LogDEBUG, "Received confirmation from pid %ld\n",
-                    (long)newpid);
-         if (lock && (res = ID0uu_lock_txfr(lock, newpid)) != UU_LOCK_OK)
-+#if defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
-+            log_Printf(LogERROR, "lock transfer failed");
-+#else
-             log_Printf(LogERROR, "uu_lock_txfr: %s\n", uu_lockerr(res));
-+#endif
- 
-         log_Printf(LogDEBUG, "Transmitting link (%d bytes)\n", expect);
-         if ((got = writev(reply[0], iov + 1, niov - 1)) != expect) {
---- a/usr.sbin/ppp/id.h
-+++ b/usr.sbin/ppp/id.h
-@@ -63,9 +63,18 @@
- #define ID0fopen fopen
- #define ID0open open
- #define ID0write write
-+
-+#if defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
-+#include <lockdev.h>
-+#define ID0uu_lock dev_lock
-+#define ID0uu_lock_txfr dev_relock
-+#define ID0uu_unlock dev_unlock
-+#define UU_LOCK_OK 0
-+#else /* on BSD */
- #define ID0uu_lock uu_lock
- #define ID0uu_lock_txfr uu_lock_txfr
- #define ID0uu_unlock uu_unlock
-+#endif
- #define ID0login pututxline
- #define ID0logout pututxline
- #define ID0bind_un(s, n) bind(s, (const struct sockaddr *)(n), sizeof *(n))
---- a/usr.sbin/ppp/physical.c
-+++ b/usr.sbin/ppp/physical.c
-@@ -307,11 +307,15 @@
- 
-   if (*p->name.full == '/' && p->type != PHYS_DIRECT &&
-       (res = ID0uu_lock(p->name.base)) != UU_LOCK_OK) {
-+#if defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
-+    log_Printf(LogPHASE, "%s: %s is in use\n", p->link.name, p->name.full);
-+#else
-     if (res == UU_LOCK_INUSE)
-       log_Printf(LogPHASE, "%s: %s is in use\n", p->link.name, p->name.full);
-     else
-       log_Printf(LogPHASE, "%s: %s is in use: uu_lock: %s\n",
-                  p->link.name, p->name.full, uu_lockerr(res));
-+#endif
-     return 0;
-   }
- 
-@@ -322,7 +326,12 @@
- physical_Unlock(struct physical *p)
- {
-   if (*p->name.full == '/' && p->type != PHYS_DIRECT &&
--      ID0uu_unlock(p->name.base) == -1)
-+#if defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
-+      ID0uu_unlock(p->name.base, 0) == -1
-+#else
-+      ID0uu_unlock(p->name.base) == -1
-+#endif
-+      )
-     log_Printf(LogALERT, "%s: Can't uu_unlock %s\n", p->link.name,
-                p->name.base);
- }
-@@ -761,7 +770,11 @@
-     int res;
- 
-     if ((res = ID0uu_lock_txfr(p->name.base, newpid)) != UU_LOCK_OK)
-+#if defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
-+      log_Printf(LogPHASE, "uu_lock_txfr");
-+#else
-       log_Printf(LogPHASE, "uu_lock_txfr: %s\n", uu_lockerr(res));
-+#endif
-   }
- }
- 

Modified: trunk/freebsd-utils/debian/patches/makefiles.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/makefiles.diff	2013-12-01 12:20:02 UTC (rev 5207)
+++ trunk/freebsd-utils/debian/patches/makefiles.diff	2013-12-01 12:32:11 UTC (rev 5208)
@@ -9,18 +9,10 @@
  M4FLAGS=
  
 -LDADD= -lcrypt -lmd -lutil -lz
-+LDADD= -lcrypt -lz
++LDADD= -lcrypt      -lutil-freebsd -lz
  DPADD=	${LIBCRYPT} ${LIBMD} ${LIBUTIL} ${LIBZ}
  
  .SUFFIXES: .8 .8.m4
-@@ -79,6 +79,7 @@
- 
- .if defined(PPP_NO_SUID)
- CFLAGS+=-DNOSUID
-+LDADD+= -llockdev
- .else
- SRCS+=	id.c
- .endif
 --- a/usr.sbin/nfsd/Makefile
 +++ b/usr.sbin/nfsd/Makefile
 @@ -3,5 +3,7 @@

Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series	2013-12-01 12:20:02 UTC (rev 5207)
+++ trunk/freebsd-utils/debian/patches/series	2013-12-01 12:32:11 UTC (rev 5208)
@@ -35,7 +35,6 @@
 035_nfs.diff
 039_geom.diff
 041_delete_key.diff
-043_ppp.diff
 devd_link_c++_statically.diff
 stablerestart-fhs-compliance.diff
 rpc.lockd-startup-fix.diff