Bug#980607: [PATCH] netcfg: FTBFS: test/test_inet_mton.c:12:15: error: too many arguments for format [-Werror=format-extra-args]

2021-02-21 Thread John Paul Adrian Glaubitz 



> On Feb 22, 2021, at 12:24 AM, Francisco Vilmar Cardoso Ruviaro 
>  wrote:
> 
> Hello everyone,
> 
> I would like to help with this,
> I reviewed the patches (thanks Dennis) and created an MR at
> https://salsa.debian.org/installer-team/netcfg/-/merge_requests/5.
> 
> As Bart said, the patches solve the FTBFS.
> 
> I intend to make a delayed NMU in 7 days.

That shouldn’t be necessary as Holger is usually very quick working on d-i 
issues.

If Holger isn’t available, I can merge the patch and upload the updated package.

Adrian

Bug#980607: [PATCH] netcfg: FTBFS: test/test_inet_mton.c:12:15: error: too many arguments for format [-Werror=format-extra-args]

2021-02-21 Thread Francisco Vilmar Cardoso Ruviaro 
Hello everyone,

I would like to help with this,
I reviewed the patches (thanks Dennis) and created an MR at
https://salsa.debian.org/installer-team/netcfg/-/merge_requests/5.

As Bart said, the patches solve the FTBFS.

I intend to make a delayed NMU in 7 days.

Regards,
-- 
Francisco Vilmar Cardoso Ruviaro 
4096R: 1B8C F656 EF3B 8447 2F48 F0E7 82FB F706 0B2F 7D00



OpenPGP_signature
Description: OpenPGP digital signature

Bug#980607: [PATCH] netcfg: FTBFS: test/test_inet_mton.c:12:15: error: too many arguments for format [-Werror=format-extra-args]

2021-02-10 Thread Dennis Filder 
On Wed, Feb 10, 2021 at 05:41:29PM +0100, Cyril Brulebois wrote:

> Patches fail to apply locally, and I'd rather avoid having to fix
> them up (possibly breaking things in the process).

Strange: When I download the patches from BTS somehow they have
mangled whitespace whereas my local patches don't.  No idea what
happened here.  Is that a known issue?  Regardless I attached the
patches anew compressed plus an md5sums file and verified that they
apply fine against current master HEAD
b897697d6f1d816b3420dac277bcd58da336da7e and preserve the whitespace
style of each changed line.

Regards,
Dennis.


netcfg_1.169-fix-CheckAPI.patch.gz
Description: application/gzip


netcfg_1.169-fix-strncpy.patch.gz
Description: application/gzip
5143239a2f25142ee06b02d4c70db735  netcfg_1.169-fix-CheckAPI.patch.gz
092ebedd836b8640f05d04ca9638e911  netcfg_1.169-fix-strncpy.patch.gz

Bug#980607: [PATCH] netcfg: FTBFS: test/test_inet_mton.c:12:15: error: too many arguments for format [-Werror=format-extra-args]

2021-02-10 Thread Cyril Brulebois 
Hallo Dennis,

Dennis Filder  (2021-02-10):
> Control: tag -1 + patch upstream
> 
> The attached patches allowed me to build netcfg 1.169 again, at least
> on amd64.

Thanks for your patches. Any chance I could trick you into pushing a
branch somewhere? Patches fail to apply locally, and I'd rather avoid
having to fix them up (possibly breaking things in the process).

The git repository is located here:
  https://salsa.debian.org/installer-team/netcfg

Thanks in advance!


Cheers,
-- 
Cyril Brulebois (k...@debian.org)
D-I release manager -- Release team member -- Freelance Consultant


signature.asc
Description: PGP signature

Bug#980607: [PATCH] netcfg: FTBFS: test/test_inet_mton.c:12:15: error: too many arguments for format [-Werror=format-extra-args]

2021-02-10 Thread Dennis Filder 
Control: tag -1 + patch upstream

The attached patches allowed me to build netcfg 1.169 again, at least
on amd64.
Description: Update testcases to work with current Check API
 Some calls of the Check API (fail_unless(), fail_if(), ...) were
 deprecated long ago and no longer compile correctly (#980607).  This
 patch works in the new calls and adds some polish where needed.
 .
 test/srunner.c: The Check API was apparently changed at some point to
 derive testcase names from function names plus a "_fn" suffix which
 breaks an old testcase.  Test for that and use the old name for now.
Author: Dennis Filder 
Bug-Debian: https://bugs.debian.org/980607
Last-Update: 2021-02-09
---
diff --git netcfg-1.169/test/test_nc_v6_interface_configured.c netcfg-1.169/test/test_nc_v6_interface_configured.c
index 92fa9c4..41afc7b 100644
--- netcfg-1.169/test/test_nc_v6_interface_configured.c
+++ netcfg-1.169/test/test_nc_v6_interface_configured.c
@@ -15,7 +15,7 @@ START_TEST(test_nc_v6_interface_configured_simple)

 	rv = nc_v6_interface_configured(, 0);

-	fail_unless(rv == 1, "Didn't find SLAAC");
+	ck_assert_msg(rv == 1, "Didn't find SLAAC");

 	srunner_reset_path();
 }
diff --git netcfg-1.169/test/test_netcfg_gateway_reachable.c netcfg-1.169/test/test_netcfg_gateway_reachable.c
index 840d145..75f5414 100644
--- netcfg-1.169/test/test_netcfg_gateway_reachable.c
+++ netcfg-1.169/test/test_netcfg_gateway_reachable.c
@@ -11,12 +11,12 @@ START_TEST(test_netcfg_gateway_reachable_v4_24)
 	iface.masklen = 24;
 	iface.address_family = AF_INET;

-	fail_unless (netcfg_gateway_reachable(),
+	ck_assert_msg (netcfg_gateway_reachable(),
 	 "Gateway erroneously unreachable");

 	strcpy(iface.gateway, "192.168.2.254");

-	fail_if (netcfg_gateway_reachable(),
+	ck_assert_msg (!netcfg_gateway_reachable(),
 	 "Gateway erroneously reachable");
 }
 END_TEST
@@ -31,12 +31,12 @@ START_TEST(test_netcfg_gateway_reachable_v4_22)
 	iface.masklen = 22;
 	iface.address_family = AF_INET;

-	fail_unless (netcfg_gateway_reachable(),
+	ck_assert_msg (netcfg_gateway_reachable(),
 	 "Gateway erroneously unreachable");

 	strcpy(iface.gateway, "192.168.4.254");

-	fail_if (netcfg_gateway_reachable(),
+	ck_assert_msg (!netcfg_gateway_reachable(),
 	 "Gateway erroneously reachable");
 }
 END_TEST
@@ -51,12 +51,12 @@ START_TEST(test_netcfg_gateway_reachable_v6_64)
 	iface.masklen = 64;
 	iface.address_family = AF_INET6;

-	fail_unless (netcfg_gateway_reachable(),
+	ck_assert_msg (netcfg_gateway_reachable(),
 	 "Gateway erroneously unreachable");

 	strcpy(iface.gateway, "2001:3:5::1");

-	fail_if (netcfg_gateway_reachable(),
+	ck_assert_msg (!netcfg_gateway_reachable(),
 	 "Gateway erroneously reachable");
 }
 END_TEST
@@ -71,12 +71,12 @@ START_TEST(test_netcfg_gateway_reachable_v6_48)
 	iface.masklen = 48;
 	iface.address_family = AF_INET6;

-	fail_unless (netcfg_gateway_reachable(),
+	ck_assert_msg (netcfg_gateway_reachable(),
 	 "Gateway erroneously unreachable");

 	strcpy(iface.gateway, "2001:3:6::1");

-	fail_if (netcfg_gateway_reachable(),
+	ck_assert_msg (!netcfg_gateway_reachable(),
 	 "Gateway erroneously reachable");
 }
 END_TEST
diff --git netcfg-1.169/test/test_inet_ptom.c netcfg-1.169/test/test_inet_ptom.c
index 8d67119..6a45deb 100644
--- netcfg-1.169/test/test_inet_ptom.c
+++ netcfg-1.169/test/test_inet_ptom.c
@@ -7,7 +7,7 @@ START_TEST(test_inet_ptom_v4_24)

 	inet_ptom(AF_INET, "255.255.255.0", );

-	fail_unless (24 == masklen, "Expected masklen == 24, masklen was %i", masklen);
+	ck_assert_msg (24 == masklen, "Expected masklen == 24, masklen was %i", masklen);
 }
 END_TEST

@@ -17,7 +17,7 @@ START_TEST(test_inet_ptom_v4_22)

 	inet_ptom(AF_INET, "255.255.252.0", );

-	fail_unless (22 == masklen, "Expected masklen == 22, masklen was %i", masklen);
+	ck_assert_msg (22 == masklen, "Expected masklen == 22, masklen was %i", masklen);
 }
 END_TEST

@@ -27,7 +27,7 @@ START_TEST(test_inet_ptom_v6_64)

 	inet_ptom(AF_INET6, ":::::", );

-	fail_unless (64 == masklen, "Expected masklen == 64, masklen was %i", masklen);
+	ck_assert_msg (64 == masklen, "Expected masklen == 64, masklen was %i", masklen);
 }
 END_TEST

@@ -37,7 +37,7 @@ START_TEST(test_inet_ptom_v6_60)

 	inet_ptom(AF_INET6, ":::fff0::", );

-	fail_unless (60 == masklen, "Expected masklen == 60, masklen was %i", masklen);
+	ck_assert_msg (60 == masklen, "Expected masklen == 60, masklen was %i", masklen);
 }
 END_TEST

@@ -51,7 +51,7 @@ START_TEST(test_inet_ptom_v6_60_with_scraps)
 	 */
 	inet_ptom(AF_INET6, ":::fff0:::", );

-	fail_unless (60 == masklen, "Expected masklen == 60, masklen was %i", masklen);
+	ck_assert_msg (60 == masklen, "Expected masklen == 60, masklen was %i", masklen);
 }
 END_TEST

diff --git netcfg-1.169/test/test_netcfg_network_address.c netcfg-1.169/test/test_netcfg_network_address.c
index f14fcc9..a2c1f2c 100644
---