control: tags -1 patch pending Hello, I have uploaded the following debdiff to fix the recent build failure due to new bglibs in unstable, fixing also the two open bugs.
sorry for the rush G.
diff -u ucspi-proxy-0.99/debian/changelog ucspi-proxy-0.99/debian/changelog
--- ucspi-proxy-0.99/debian/changelog
+++ ucspi-proxy-0.99/debian/changelog
@@ -1,3 +1,15 @@
+ucspi-proxy (0.99-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * Switch to unversioned libbg-dev dependency
+ * Fix build with new libbg2
+ * Make build reproducible (Closes: #777365)
+ - thanks Chris Lamb for the patch
+ * Drop bglibs defaulting to usr/lib, already in
+ the default search path (Closes: #723553)
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org> Tue, 12 Dec 2017
17:05:43 +0100
+
ucspi-proxy (0.99-1) unstable; urgency=low
* new upstream version.
diff -u ucspi-proxy-0.99/debian/control ucspi-proxy-0.99/debian/control
--- ucspi-proxy-0.99/debian/control
+++ ucspi-proxy-0.99/debian/control
@@ -2,7 +2,7 @@
Section: net
Priority: optional
Maintainer: Gerrit Pape <p...@smarden.org>
-Build-Depends: libbg1-dev
+Build-Depends: libbg-dev
Standards-Version: 3.9.5.0
Package: ucspi-proxy
diff -u ucspi-proxy-0.99/debian/diff/0002-Makefile-avoid-rpath.diff
ucspi-proxy-0.99/debian/diff/0002-Makefile-avoid-rpath.diff
--- ucspi-proxy-0.99/debian/diff/0002-Makefile-avoid-rpath.diff
+++ ucspi-proxy-0.99/debian/diff/0002-Makefile-avoid-rpath.diff
@@ -16,7 +16,7 @@
echo '#!/bin/sh';\
echo 'main="$$1"; shift';\
- echo exec `head -n 1 conf-ld` -L. "-L'$${bglibs}'"
"-Wl,-R'$${bglibs}'" '-o "$$main" "$$main.o" $${1+"$$@"}' -lbg-sysdeps; \
-+ echo exec `head -n 1 conf-ld` -L. "-L'$${bglibs}'" '-o "$$main"
"$$main.o" $${1+"$$@"}' -lbg-sysdeps; \
++ echo exec `head -n 1 conf-ld` -L. "-L'$${bglibs}'" '-o "$$main"
"$$main.o" $${1+"$$@"}' -lbg; \
) >load
chmod 755 load
diff -u ucspi-proxy-0.99/debian/implicit ucspi-proxy-0.99/debian/implicit
--- ucspi-proxy-0.99/debian/implicit
+++ ucspi-proxy-0.99/debian/implicit
@@ -35,7 +35,7 @@
debian/$*/usr/share/doc/$*/changelog'
@test -s debian/$*/usr/share/doc/$*/changelog || \
sh -cx 'rm -f debian/$*/usr/share/doc/$*/changelog'
- @gzip -9 debian/$*/usr/share/doc/$*/changelog*
+ @gzip -9n debian/$*/usr/share/doc/$*/changelog*
%.deb-docs-docs: %.deb-docs-base
@for i in `cat debian/$*.docs 2>/dev/null || :`; do \
if test -d $$i; then \
@@ -54,7 +54,7 @@
@if test -r debian/$*.NEWS.Debian; then \
sh -cx 'install -m0644 debian/$*.NEWS.Debian \
debian/$*/usr/share/doc/$*/NEWS.Debian && \
- gzip -9 debian/$*/usr/share/doc/$*/NEWS.Debian'; \
+ gzip -9n debian/$*/usr/share/doc/$*/NEWS.Debian'; \
fi
%.deb-docs-examples: %.deb-docs-docs
@rm -rf debian/$*/usr/share/doc/$*/examples
diff -u ucspi-proxy-0.99/debian/rules ucspi-proxy-0.99/debian/rules
--- ucspi-proxy-0.99/debian/rules
+++ ucspi-proxy-0.99/debian/rules
@@ -4,7 +4,6 @@
CFLAGS =-W -Wall -Wshadow -O2 -g
STRIP =strip
BGINCS =/usr/include/bglibs
-BGLIBS =/usr/lib
ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
STRIP =: nostrip
@@ -26,7 +25,6 @@
done
echo '/usr/bin' >conf-bin
echo '$(BGINCS)' >conf-bgincs
- echo '$(BGLIBS)' >conf-bglibs
echo '$(CC) $(CFLAGS)' >conf-cc
echo '$(CC)' >conf-ld
echo '/usr/share/man' >conf-man
only in patch2:
unchanged:
--- ucspi-proxy-0.99.orig/auth-lib.c
+++ ucspi-proxy-0.99/auth-lib.c
@@ -4,8 +4,8 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <msg/msg.h>
-#include <str/str.h>
+#include <bglibs/msg.h>
+#include <bglibs/str.h>
#include "auth-lib.h"
#include "ucspi-proxy.h"
only in patch2:
unchanged:
--- ucspi-proxy-0.99.orig/base64.c
+++ ucspi-proxy-0.99/base64.c
@@ -1,9 +1,9 @@
#include <stdlib.h>
#include <sys/types.h>
-#include <base64/base64.h>
-#include <msg/msg.h>
-#include <str/str.h>
+#include <bglibs/base64.h>
+#include <bglibs/msg.h>
+#include <bglibs/str.h>
#include "ucspi-proxy.h"
only in patch2:
unchanged:
--- ucspi-proxy-0.99.orig/imap-filter.c
+++ ucspi-proxy-0.99/imap-filter.c
@@ -4,7 +4,7 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <str/str.h>
+#include <bglibs/str.h>
#include "auth-lib.h"
#include "ucspi-proxy.h"
only in patch2:
unchanged:
--- ucspi-proxy-0.99.orig/pop3-filter.c
+++ ucspi-proxy-0.99/pop3-filter.c
@@ -4,7 +4,7 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <str/str.h>
+#include <bglibs/str.h>
#include "auth-lib.h"
#include "ucspi-proxy.h"
only in patch2:
unchanged:
--- ucspi-proxy-0.99.orig/relay-filter.c
+++ ucspi-proxy-0.99/relay-filter.c
@@ -5,8 +5,8 @@
#include <string.h>
#include <sys/wait.h>
#include <unistd.h>
-#include <msg/msg.h>
-#include <unix/sig.h>
+#include <bglibs/msg.h>
+#include <bglibs/sig.h>
#include "ucspi-proxy.h"
static unsigned relay_rerun_delay;
only in patch2:
unchanged:
--- ucspi-proxy-0.99.orig/tcp-connect.c
+++ ucspi-proxy-0.99/tcp-connect.c
@@ -2,10 +2,10 @@
#include <netdb.h>
#include <stdlib.h>
#include <unistd.h>
-#include <msg/msg.h>
-#include <net/resolve.h>
-#include <net/socket.h>
-#include <unix/nonblock.h>
+#include <bglibs/msg.h>
+#include <bglibs/resolve.h>
+#include <bglibs/socket.h>
+#include <bglibs/unix.h>
#include "ucspi-proxy.h"
static ipv4addr addr;
only in patch2:
unchanged:
--- ucspi-proxy-0.99.orig/ucspi-proxy.c
+++ ucspi-proxy-0.99/ucspi-proxy.c
@@ -6,10 +6,10 @@
#include <string.h>
#include <sys/time.h>
#include <unistd.h>
-#include <fmt/number.h>
-#include <iobuf/iobuf.h>
-#include <msg/msg.h>
-#include <str/str.h>
+#include <bglibs/fmt.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/msg.h>
+#include <bglibs/str.h>
#include "ucspi-proxy.h"
const int msg_show_pid = 1;
signature.asc
Description: OpenPGP digital signature
