Package: twoftpd Version: 1.42-1.1 Severity: normal Tags: patch pending Dear maintainer,
I've prepared an NMU for twoftpd (versioned as 1.42-1.2) and uploaded it to DELAYED/0 due to the bglibs transition Regards.
diff -u twoftpd-1.42/debian/changelog twoftpd-1.42/debian/changelog --- twoftpd-1.42/debian/changelog +++ twoftpd-1.42/debian/changelog @@ -1,3 +1,11 @@ +twoftpd (1.42-1.2) unstable; urgency=medium + + * Rebuild against new libbg2. + * Drop unversioned libbg dependency + * Update sources for new bglibs locations + + -- Gianfranco Costamagna <locutusofb...@debian.org> Tue, 12 Dec 2017 17:06:30 +0100 + twoftpd (1.42-1.1) unstable; urgency=medium * Non-maintainer upload. diff -u twoftpd-1.42/debian/control twoftpd-1.42/debian/control --- twoftpd-1.42/debian/control +++ twoftpd-1.42/debian/control @@ -2,7 +2,7 @@ Section: net Priority: optional Maintainer: Gerrit Pape <p...@smarden.org> -Build-Depends: libbg1-dev, libcvm1-dev, man2html +Build-Depends: libbg-dev, libcvm1-dev, man2html Standards-Version: 3.8.4.0 Vcs-Git: http://smarden.org/git/twoftpd.git/ only in patch2: unchanged: --- twoftpd-1.42.orig/backend.c +++ twoftpd-1.42/backend.c @@ -20,11 +20,11 @@ #include <limits.h> #include <stdlib.h> #include <string.h> -#include <systime.h> +#include <bglibs/systime.h> #include <unistd.h> -#include <sysdeps.h> -#include <path/path.h> +#include <bglibs/sysdeps.h> +#include <bglibs/path.h> #include "twoftpd.h" #include "backend.h" only in patch2: unchanged: --- twoftpd-1.42.orig/backend.h +++ twoftpd-1.42/backend.h @@ -1,8 +1,8 @@ #ifndef TWOFTPD__BACKEND__H__ #define TWOFTPD__BACKEND__H__ -#include <iobuf/iobuf.h> -#include <str/str.h> +#include <bglibs/iobuf.h> +#include <bglibs/str.h> #include <sys/stat.h> #include <sys/types.h> only in patch2: unchanged: --- twoftpd-1.42.orig/conf.c +++ twoftpd-1.42/conf.c @@ -21,8 +21,8 @@ #include <sys/types.h> #include <unistd.h> #include "conf.h" -#include <iobuf/iobuf.h> -#include <msg/msg.h> +#include <bglibs/iobuf.h> +#include <bglibs/msg.h> obuf conf_out; static const char* currfile; only in patch2: unchanged: --- twoftpd-1.42.orig/conf.h +++ twoftpd-1.42/conf.h @@ -1,7 +1,7 @@ #ifndef CONF__H__ #define CONF__H__ -#include <iobuf/iobuf.h> +#include <bglibs/iobuf.h> extern obuf conf_out; extern void start_file(const char* filename, int mode); extern void end_file(void); only in patch2: unchanged: --- twoftpd-1.42.orig/copy.c +++ twoftpd-1.42/copy.c @@ -15,10 +15,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <sysdeps.h> +#include <bglibs/sysdeps.h> #include <errno.h> #include <unistd.h> -#include <net/socket.h> +#include <bglibs/socket.h> #include "backend.h" static int error_code(int err) only in patch2: unchanged: --- twoftpd-1.42.orig/debian/diff/0004-Makefile-avoid-bg-sysdeps.diff +++ twoftpd-1.42/debian/diff/0004-Makefile-avoid-bg-sysdeps.diff @@ -0,0 +1,11 @@ +--- a/Makefile 2017-12-13 12:52:00.769778558 +0100 ++++ b/Makefile 2017-12-13 12:50:38.781238702 +0100 +@@ -59,7 +59,7 @@ load: conf-ld conf-bglibs + ( bglibs=`head -n 1 conf-bglibs`; \ + echo '#!/bin/sh';\ + echo 'main="$$1"; shift';\ +- 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 + only in patch2: unchanged: --- twoftpd-1.42.orig/list.c +++ twoftpd-1.42/list.c @@ -20,13 +20,13 @@ #include <string.h> #include <sys/types.h> #include <unistd.h> -#include <systime.h> -#include <sysdeps.h> +#include <bglibs/systime.h> +#include <bglibs/sysdeps.h> #include "twoftpd.h" #include "backend.h" -#include <net/socket.h> -#include <path/path.h> -#include <str/str.h> +#include <bglibs/socket.h> +#include <bglibs/path.h> +#include <bglibs/str.h> int list_options; only in patch2: unchanged: --- twoftpd-1.42.orig/log.c +++ twoftpd-1.42/log.c @@ -18,7 +18,7 @@ #include <string.h> #include <sys/types.h> #include <unistd.h> -#include <iobuf/iobuf.h> +#include <bglibs/iobuf.h> #include "log.h" static pid_t pid = 0; only in patch2: unchanged: --- twoftpd-1.42.orig/main.c +++ twoftpd-1.42/main.c @@ -18,8 +18,8 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <iobuf/iobuf.h> -#include <unix/sig.h> +#include <bglibs/iobuf.h> +#include <bglibs/sig.h> #include "twoftpd.h" #include "log.h" only in patch2: unchanged: --- twoftpd-1.42.orig/messagefile.c +++ twoftpd-1.42/messagefile.c @@ -17,7 +17,7 @@ */ #include <stdlib.h> #include <string.h> -#include <systime.h> +#include <bglibs/systime.h> #include <unistd.h> #include "twoftpd.h" #include "backend.h" only in patch2: unchanged: --- twoftpd-1.42.orig/path.c +++ twoftpd-1.42/path.c @@ -20,7 +20,7 @@ #include <unistd.h> #include "twoftpd.h" #include "backend.h" -#include <path/path.h> +#include <bglibs/path.h> str fullpath; only in patch2: unchanged: --- twoftpd-1.42.orig/respond.c +++ twoftpd-1.42/respond.c @@ -17,8 +17,8 @@ */ #include <errno.h> #include <string.h> -#include <iobuf/iobuf.h> -#include <systime.h> +#include <bglibs/iobuf.h> +#include <bglibs/systime.h> #include "twoftpd.h" #include "log.h" only in patch2: unchanged: --- twoftpd-1.42.orig/socket.c +++ twoftpd-1.42/socket.c @@ -18,12 +18,12 @@ #include <errno.h> #include <string.h> #include <unistd.h> -#include <fmt/multi.h> -#include <net/socket.h> +#include <bglibs/fmt.h> +#include <bglibs/socket.h> #include "twoftpd.h" #include "backend.h" -#include <sysdeps.h> -#include <unix/nonblock.h> +#include <bglibs/sysdeps.h> +#include <bglibs/unix.h> /* State variables */ static int socket_fd = -1; only in patch2: unchanged: --- twoftpd-1.42.orig/stat.c +++ twoftpd-1.42/stat.c @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <stdio.h> -#include <systime.h> -#include <fmt/number.h> +#include <bglibs/systime.h> +#include <bglibs/fmt.h> #include "twoftpd.h" #include "backend.h" only in patch2: unchanged: --- twoftpd-1.42.orig/state.c +++ twoftpd-1.42/state.c @@ -19,7 +19,7 @@ #include <unistd.h> #include "twoftpd.h" #include "backend.h" -#include <path/path.h> +#include <bglibs/path.h> int binary_flag = 0; str cwd = {0,0,0}; only in patch2: unchanged: --- twoftpd-1.42.orig/statmod.c +++ twoftpd-1.42/statmod.c @@ -19,7 +19,7 @@ #include <ctype.h> #include <stdio.h> #include <utime.h> -#include <systime.h> +#include <bglibs/systime.h> #include "twoftpd.h" #include "backend.h" only in patch2: unchanged: --- twoftpd-1.42.orig/twoftpd-anon-conf.c +++ twoftpd-1.42/twoftpd-anon-conf.c @@ -23,8 +23,8 @@ #include <unistd.h> #include "conf.h" #include "conf_bin.c" -#include <iobuf/iobuf.h> -#include <msg/msg.h> +#include <bglibs/iobuf.h> +#include <bglibs/msg.h> const char program[] = "twoftpd-anon-conf"; static const char usage_str[] = only in patch2: unchanged: --- twoftpd-1.42.orig/twoftpd-auth.c +++ twoftpd-1.42/twoftpd-auth.c @@ -19,7 +19,7 @@ #include <string.h> #include <unistd.h> -#include <sysdeps.h> +#include <bglibs/sysdeps.h> #include <cvm/v2client.h> #include "twoftpd.h" only in patch2: unchanged: --- twoftpd-1.42.orig/twoftpd-bind-port.c +++ twoftpd-1.42/twoftpd-bind-port.c @@ -19,11 +19,11 @@ #include <errno.h> #include <signal.h> #include <unistd.h> -#include <net/socket.h> -#include <str/str.h> -#include <sysdeps.h> +#include <bglibs/socket.h> +#include <bglibs/str.h> +#include <bglibs/sysdeps.h> -#include <msg/msg.h> +#include <bglibs/msg.h> #include "twoftpd.h" only in patch2: unchanged: --- twoftpd-1.42.orig/twoftpd-conf.c +++ twoftpd-1.42/twoftpd-conf.c @@ -23,8 +23,8 @@ #include <unistd.h> #include "conf.h" #include "conf_bin.c" -#include <iobuf/iobuf.h> -#include <msg/msg.h> +#include <bglibs/iobuf.h> +#include <bglibs/msg.h> const char program[] = "twoftpd-conf"; static const char usage_str[] = only in patch2: unchanged: --- twoftpd-1.42.orig/twoftpd-switch.c +++ twoftpd-1.42/twoftpd-switch.c @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <sysdeps.h> +#include <bglibs/sysdeps.h> #include <stdlib.h> #include <string.h> #include <unistd.h>
signature.asc
Description: OpenPGP digital signature
