Bug#967845: yersinia: depends on deprecated GTK 2

2023-11-10 Thread Bastian Germann

Am 12.08.23 um 04:17 schrieb Bastian Germann:

Please build with configure --disable-gtk and drop the build dependency.


I am uploading a NMU to DELAYED/10 in order to fix this.
Please find the debdiff attached.diff -Nru yersinia-0.8.2/debian/changelog yersinia-0.8.2/debian/changelog
--- yersinia-0.8.2/debian/changelog 2020-10-06 01:42:32.0 +0200
+++ yersinia-0.8.2/debian/changelog 2023-11-10 16:14:01.0 +0100
@@ -1,3 +1,13 @@
+yersinia (0.8.2-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * Replace source URLs, closes: #1055738
+
+  [ Vagrant Cascadian ]
+  * Avoid embedding build path, closes: #1021512
+
+ -- Bastian Germann   Fri, 10 Nov 2023 16:14:01 +0100
+
 yersinia (0.8.2-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru yersinia-0.8.2/debian/control yersinia-0.8.2/debian/control
--- yersinia-0.8.2/debian/control   2020-10-06 01:42:32.0 +0200
+++ yersinia-0.8.2/debian/control   2023-11-10 16:14:01.0 +0100
@@ -2,9 +2,9 @@
 Section: admin
 Priority: optional
 Maintainer: Noël Köthe 
-Build-Depends: debhelper (>= 9.0.0), dh-autoreconf, libncurses5-dev (>=5.4), 
libnet1-dev (>=1.1.2), libpcap0.8-dev, libgtk2.0-dev, lsb-release
+Build-Depends: debhelper (>= 9.0.0), dh-autoreconf, libncurses5-dev (>=5.4), 
libnet1-dev (>=1.1.2), libpcap0.8-dev, libglib2.0-dev
 Standards-Version: 4.1.0
-Homepage: http://www.yersinia.net/
+Homepage: https://github.com/tomac/yersinia
 
 Package: yersinia
 Architecture: any
diff -Nru yersinia-0.8.2/debian/copyright yersinia-0.8.2/debian/copyright
--- yersinia-0.8.2/debian/copyright 2016-07-03 19:26:37.0 +0200
+++ yersinia-0.8.2/debian/copyright 2023-11-10 16:14:01.0 +0100
@@ -2,9 +2,7 @@
 Raphael Enrici  on Wed,  1 Mar 2006 21:47:00 +0100
 Noël Köthe  on Wed, 30 Oct 2013 18:53:19 +0100
 
-It was downloaded from
-http://yersinia.sf.net/
-http://www.yersinia.net/download/
+Source: https://github.com/tomac/yersinia
 
 Upstream authors (contents of AUTHORS file):
- Alfredo Andres Omella 
diff -Nru yersinia-0.8.2/debian/patches/gcc10.patch 
yersinia-0.8.2/debian/patches/gcc10.patch
--- yersinia-0.8.2/debian/patches/gcc10.patch   2020-10-05 05:26:28.0 
+0200
+++ yersinia-0.8.2/debian/patches/gcc10.patch   2023-11-10 16:14:01.0 
+0100
@@ -44,18 +44,17 @@
  
  void   protocol_init(void);
  int8_t protocol_register(u_int8_t, const char *, const char *, const char *,
 a/src/gtk-gui.c
-+++ b/src/gtk-gui.c
-@@ -70,6 +70,9 @@
- #include "gtk-interface.h"
- #include "gtk-support.h"
+--- a/src/ncurses-gui.c
 b/src/ncurses-gui.c
+@@ -93,6 +93,8 @@
+ #include "ncurses-interface.h"
+ #include "ncurses-callbacks.h"
  
 +u_int8_t pointer[MAX_PROTOCOLS];
 +
-+
- void
- gtk_gui (void *args)
- {
+ /*
+  * Initialization routines for the GUI
+  */
 --- a/src/interfaces.c
 +++ b/src/interfaces.c
 @@ -102,7 +102,7 @@
diff -Nru yersinia-0.8.2/debian/rules yersinia-0.8.2/debian/rules
--- yersinia-0.8.2/debian/rules 2017-09-17 21:00:46.0 +0200
+++ yersinia-0.8.2/debian/rules 2023-11-10 16:14:01.0 +0100
@@ -16,6 +16,8 @@
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 CFLAGS = -Wall -g
+# Avoid embedding build path for reproducible builds
+CFLAGS += -ffile-prefix-map=$(CURDIR)=.
 
 config.status:
dh_testdir
@@ -24,6 +26,7 @@
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
+   --disable-gtk \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info
 
@@ -37,7 +40,7 @@
dh_testdir
 
# Add here commands to compile the package.
-   $(MAKE)
+   $(MAKE) CFLAGS="$(CFLAGS)"
#docbook-to-man debian/yersinia.sgml > yersinia.1
 
touch build-stamp
diff -Nru yersinia-0.8.2/debian/watch yersinia-0.8.2/debian/watch
--- yersinia-0.8.2/debian/watch 2016-07-02 19:13:15.0 +0200
+++ yersinia-0.8.2/debian/watch 2023-11-10 16:14:01.0 +0100
@@ -1,2 +1,2 @@
-version=3
-http://www.yersinia.net/download/yersinia-(.*)\.tar\.gz
+version=4
+https://github.com/tomac/yersinia/tags .*/tags/v(.+)\.tar\.gz


Bug#967845: yersinia: depends on deprecated GTK 2

2023-08-11 Thread Bastian Germann

Please build with configure --disable-gtk and drop the build dependency.