On 01/13/2018 06:11 PM, Julien Cristau wrote:
> Control: tag -1 moreinfo
>
> On Sat, Dec 9, 2017 at 00:30:01 +0100, Thomas Goirand wrote:
>
>> Package: release.debian.org
>> Severity: normal
>> Tags: stretch
>> User: release.debian....@packages.debian.org
>> Usertags: pu
>>
>> Dear release team,
>>
>> congress-server was built with openstack-pkg-tools *before* it stopped using
>> /sbin/route from net-tools. Therefore, it's using /usr/sbin at setup time
>> even though net-tools isn't a runtime dependency.
>>
>> So I would like to upload a rebuild of Congress to Stretch, so its
>> maintainer scripts would not need net-tools anymore. This would fix #858693.
>>
>> Of course, since I am not planning any modification to the package, I have
>> no debdiff to show (it would only contain a new changelog entry, which isn't
>> very useful to review).
>>
> If the rebuild makes a difference, then please show what that difference
> actually is? Possibly that means a binary debdiff in addition to the
> normal source diff.
>
> Cheers,
> Julien
Hi Julien,
Here's the resulting changes on the config script, attached to this
message, together with the debdiff. As you can see, the script now reads
/proc/net/route directly instead of using /sbin/route, so we don't need
the net-tools package which was otherwise missing in dependencies.
Cheers,
Thomas Goirand (zigo)
diff -Nru congress-4.0.0+dfsg1/debian/changelog
congress-4.0.0+dfsg1/debian/changelog
--- congress-4.0.0+dfsg1/debian/changelog 2016-11-03 11:16:31.000000000
+0000
+++ congress-4.0.0+dfsg1/debian/changelog 2018-01-19 14:59:16.000000000
+0000
@@ -1,3 +1,9 @@
+congress (4.0.0+dfsg1-3+deb9u1) stretch; urgency=medium
+
+ * Rebuilt with openstack-pkg-tools >= 54~.
+
+ -- Thomas Goirand <z...@debian.org> Fri, 19 Jan 2018 15:59:16 +0100
+
congress (4.0.0+dfsg1-3) unstable; urgency=medium
* Add patch to remove non-deterministic tests which are randomly failing.
diff -Nru congress-4.0.0+dfsg1/debian/control
congress-4.0.0+dfsg1/debian/control
--- congress-4.0.0+dfsg1/debian/control 2016-11-03 11:16:31.000000000 +0000
+++ congress-4.0.0+dfsg1/debian/control 2018-01-19 14:59:16.000000000 +0000
@@ -6,7 +6,7 @@
Build-Depends: debhelper (>= 9),
dh-python,
dh-systemd,
- openstack-pkg-tools (>= 52~),
+ openstack-pkg-tools (>= 54~),
po-debconf,
python-all,
python-pbr (>= 1.8),
--- config_4.0.0+dfsg1-3 2018-01-19 15:01:06.435195600 +0000
+++ config 2018-01-20 13:10:12.214651060 +0000
@@ -651,8 +651,12 @@
db_get ${REG_ENDP_PKG_NAME}/endpoint-ip || true
if [ -z "${RET}" ] ; then
- DEFROUTE_IF=`LC_ALL=C /sbin/route | grep default |awk -- '{ print $8 }'`
- DEFROUTE_IP=`LC_ALL=C ip addr show "${DEFROUTE_IF}" | grep inet | head -n 1 | awk '{print $2}' | cut -d/ -f1 | grep -E '^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$'`
+ if [ -x /bin/ip ] ; then
+ DEFROUTE_IF=`awk '{ if ( $2 == "00000000" ) print $1 }' /proc/net/route`
+ DEFROUTE_IP=`LC_ALL=C ip addr show "${DEFROUTE_IF}" | grep inet | head -n 1 | awk '{print $2}' | cut -d/ -f1 | grep -E '^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$'`
+ else
+ DEFROUTE_IP=`hostname -i | grep -E '^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$'`
+ fi
if [ -n "${DEFROUTE_IP}" ] ; then
db_set ${REG_ENDP_PKG_NAME}/endpoint-ip ${DEFROUTE_IP}
fi
