Your message dated Wed, 14 Jun 2023 23:55:30 +0000
with message-id <[email protected]>
and subject line Bug#1024942: fixed in iptables-netflow 2.6-5
has caused the Debian Bug report #1024942,
regarding iptables-netflow FTCBFS: fails locating xtables.pc using the build 
architecture pkg-config
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)


-- 
1024942: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1024942
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: iptables-netflow
Version: 2.6-3
Tags: patch
User: [email protected]
Usertags: ftcbfs

iptables-netflow fails to cross build from source, because it generally
hard codes build architecture build tools and thus fails locating
xtables.pc using the build architecture pkg-config. Moving it to host
tools is not entirely trivial. I'm attaching a patch for your
convenience.

Helmut
diff --minimal -Nru iptables-netflow-2.6/debian/changelog 
iptables-netflow-2.6/debian/changelog
--- iptables-netflow-2.6/debian/changelog       2022-02-14 09:21:27.000000000 
+0100
+++ iptables-netflow-2.6/debian/changelog       2022-11-25 11:26:30.000000000 
+0100
@@ -1,3 +1,10 @@
+iptables-netflow (2.6-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Use host tools. (Closes: #-1)
+
+ -- Helmut Grohne <[email protected]>  Fri, 25 Nov 2022 11:26:30 +0100
+
 iptables-netflow (2.6-3) unstable; urgency=high
 
   * Cherry-pick upstream commit 6a55739a to fix build with kernel 5.15 and
diff --minimal -Nru iptables-netflow-2.6/debian/patches/cross.patch 
iptables-netflow-2.6/debian/patches/cross.patch
--- iptables-netflow-2.6/debian/patches/cross.patch     1970-01-01 
01:00:00.000000000 +0100
+++ iptables-netflow-2.6/debian/patches/cross.patch     2022-11-25 
11:26:29.000000000 +0100
@@ -0,0 +1,62 @@
+--- iptables-netflow-2.6.orig/configure
++++ iptables-netflow-2.6/configure
+@@ -123,10 +123,15 @@
+ 
+ check_pkg_config() {
+   test "$PKGWARN" && return 1
+-  if ! which pkg-config >/dev/null 2>&1; then
+-    echo "! You don't have pkg-config, it may be useful to install it."
+-    PKGWARN=1
+-    return 1
++  if test -z "$PKG_CONFIG"; then
++    if ! which pkg-config >/dev/null 2>&1; then
++      echo "! You don't have pkg-config, it may be useful to install it."
++      PKG_CONFIG=false
++      PKGWARN=1
++      return 1
++    else
++      PKG_CONFIG=pkg-config
++    fi
+   fi
+   return 0
+ }
+@@ -143,10 +148,10 @@
+       echo "no iptables binary found"
+     fi
+     check_pkg_config
+-    PKGVER=`pkg-config --modversion xtables 2>/dev/null`
++    PKGVER=`$PKG_CONFIG --modversion xtables 2>/dev/null`
+     if [ "$PKGVER" ]; then
+       IPTVER="$PKGVER"
+-      echo "Xtables version: $IPTVER (detected from `which pkg-config`)"
++      echo "Xtables version: $IPTVER (detected from $PKG_CONFIG)"
+       return
+     fi
+     error "Can not find iptables version, try setting it with --ipt-ver="
+@@ -212,10 +217,10 @@
+ iptables_try_pkgconfig() {
+   if [ ! "$PKGVER" ]; then
+     check_pkg_config
+-    PKGVER=`pkg-config --modversion xtables 2>/dev/null`
+-    TRYPKGVER=`pkg-config --modversion xtables 2>/dev/null`
++    PKGVER=`$PKG_CONFIG --modversion xtables 2>/dev/null`
++    TRYPKGVER=`$PKG_CONFIG --modversion xtables 2>/dev/null`
+     echo -n "pkg-config for version $IPTVER exists: "
+-    pkg-config --exact-version=$IPTVER xtables 2>/dev/null
++    $PKG_CONFIG --exact-version=$IPTVER xtables 2>/dev/null
+     if [ $? = 0 ]; then
+       echo "Yes"
+       PKGVER=$TRYPKGVER
+@@ -230,9 +235,9 @@
+   fi
+   if [ "$PKGVER" ]; then
+     check_pkg_config
+-    PKGVER=`pkg-config --modversion xtables 2>/dev/null`
+-    PKGINC=`pkg-config --cflags xtables`
+-    PKGLIB=`pkg-config --variable=xtlibdir xtables`
++    PKGVER=`$PKG_CONFIG --modversion xtables 2>/dev/null`
++    PKGINC=`$PKG_CONFIG --cflags xtables`
++    PKGLIB=`$PKG_CONFIG --variable=xtlibdir xtables`
+   elif expr "$IPTVER" : '^1\.3' >/dev/null; then
+     echo "! This version of iptables ($IPTVER) will be treated as old 
version."
+     # Newer versions of iptables should not have -I/kernel/include!
diff --minimal -Nru iptables-netflow-2.6/debian/patches/series 
iptables-netflow-2.6/debian/patches/series
--- iptables-netflow-2.6/debian/patches/series  2022-02-14 08:52:59.000000000 
+0100
+++ iptables-netflow-2.6/debian/patches/series  2022-11-25 11:23:09.000000000 
+0100
@@ -4,3 +4,4 @@
 dont-hardcode-current-gcc.patch
 cherry-pick_66e43041_namespace_sk_error_report.patch
 cherry-pick_6a55739a_fix_build_on_v5.15.patch
+cross.patch
diff --minimal -Nru iptables-netflow-2.6/debian/rules 
iptables-netflow-2.6/debian/rules
--- iptables-netflow-2.6/debian/rules   2021-08-24 23:01:47.000000000 +0200
+++ iptables-netflow-2.6/debian/rules   2022-11-25 11:26:30.000000000 +0100
@@ -1,17 +1,19 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE = 1
 
+include /usr/share/dpkg/architecture.mk
+DPKG_EXPORT_BUILDTOOLS=1
+include /usr/share/dpkg/buildtools.mk
 include /usr/share/dpkg/pkg-info.mk
 export DEB_VERSION_UPSTREAM
 
 # see FEATURE AREAS in dpkg-buildflags(1)
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-ARCH=$(shell dpkg-architecture -q DEB_HOST_MULTIARCH)
 DKMS_CONFIGURE_OPTIONS=\
  --prefix=/usr \
  --includedir=/usr/include \
- --libdir=/usr/lib/$(ARCH) \
+ --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
  --ipt-bin=/usr/sbin/iptables-legacy \
  --enable-natevents    \
  --enable-snmp-rules   \

--- End Message ---
--- Begin Message ---
Source: iptables-netflow
Source-Version: 2.6-5
Done: Axel Beckert <[email protected]>

We believe that the bug you reported is fixed in the latest version of
iptables-netflow, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Axel Beckert <[email protected]> (supplier of updated iptables-netflow package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Thu, 15 Jun 2023 01:16:23 +0200
Source: iptables-netflow
Architecture: source
Version: 2.6-5
Distribution: unstable
Urgency: medium
Maintainer: Axel Beckert <[email protected]>
Changed-By: Axel Beckert <[email protected]>
Closes: 1005512 1024942
Changes:
 iptables-netflow (2.6-5) unstable; urgency=medium
 .
   [ Axel Beckert ]
   * Import patches from Ubuntu to be able to build against Linux ≥ 6.2.
     + Use-explicit-fallthrough-macro.patch (refreshed)
     + use-get_random_u32_below-instead-of-deprecated-prand.patch
     LP: #2023306
   * Mention man page section of ethtool in irqtop(1). (Closes: #1005512)
   * Refresh cherry-pick_0901f028_fix_building_on_old_kernels.patch to get
     rid of some minor offset.
   * Bump packaging copyright years in debian/copyright.
   * Declare compliance with Debian Policy 4.6.2. (No changes needed.)
 .
   [ Helmut Grohne ]
   * Add patch to fix FTCBFS: Use host tools. (Closes: #1024942)
Checksums-Sha1:
 0cf21af83fbf5422ee56fbcbaa9ace29ae7d546e 2051 iptables-netflow_2.6-5.dsc
 d504b7a23c8b3a94245a05e124a4d15f0749a157 12880 
iptables-netflow_2.6-5.debian.tar.xz
 f428cc89b3037fb07db0bc3b453c8986092ba546 6722 
iptables-netflow_2.6-5_source.buildinfo
Checksums-Sha256:
 3b420b71a818b32e7f664762054c9dd0bf2203a18f0347e9e4f4b2759af0eb03 2051 
iptables-netflow_2.6-5.dsc
 4c2253d36290b02851b3a6e4d244cdd9d1b15d527863a92523adeed86e809091 12880 
iptables-netflow_2.6-5.debian.tar.xz
 454b4162d28ee5ba41dfb446d24866dd773774c2ba9cee300deeb6691c009cb2 6722 
iptables-netflow_2.6-5_source.buildinfo
Files:
 d60385183bc967996319302392735d53 2051 kernel optional 
iptables-netflow_2.6-5.dsc
 55778aab6a3724955f4ad3053bf93cb9 12880 kernel optional 
iptables-netflow_2.6-5.debian.tar.xz
 65b9ffd3043fa37298cdc247f28a23b7 6722 kernel optional 
iptables-netflow_2.6-5_source.buildinfo

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEERoyJeTtCmBnp12Ema+Zjx1o1yXUFAmSKSuoACgkQa+Zjx1o1
yXVVog//eKb65V6NhjPMW1RfAQrakhD9GNsU3KiEdko1fnS6ymRh0y9CM3Key7A9
+Yf71VhV00bpZULTBTAERodkfmP+hCvDKAVsMEvyoUASYli9f6UIk+wvzXGA46uI
pzsPNoAJLaVVVtfEXSwAbNjGt48ieKED0xbKS5AG4YKHZ7x6Rpli2mPMoxe0DU00
xSqwhCbhr6kQL1Wmf0vRdF7FzxsoAASeuRfcA81d2IE5OJW5bdUE6kpTitw+rkkA
btUZmVyjeilN5DG06alN0i5j6jtKrBsLRM+C/xBvI1Ejcq76QaqES9AxUSLfZbwk
anbk+9Ms8bgj8jOVNPTplLftAzbMrbEIh3nN4XqrbTs0ZYWAJAZZTb+DCueSgfK4
Qft001LClY7NgEpIIIA7+tLXtmGrDIfeWAHN4kJQ+5R5wR1vlZyUnlUFByqVdybH
L4ZCDw5IBEh3yTrg9x7KU6JEDvsogDC67wLGnHlNdF8WQWHytwmtc9ziw6U4fVEE
jUbkEW0I6HV3CgGKmEuOQCgOxQvnzhk/UfVvVTibNPAUljRF6nJRz7zf8Zm9GPEm
asjIQVZ/XwH4WKw1fDvVxXDNe5At25DHZlR03tye8wRTsBk887EhB7RzAoNXH2yK
Ed6sF4xrLkTnWfpfXRrpQbLmFUK/KYU1X3/Dx0CF7wgCx/sneRo=
=f1u/
-----END PGP SIGNATURE-----

--- End Message ---

Reply via email to