Merge lp:~l3on/ubuntu/precise/flowscan/fix-ftbfs into lp:ubuntu/precise/flowscan

[Leo Iannacone]

In netbase port 80/tcp is marked as 'http', no longer as 'www'.
This causes flowscan to fail during build while configure search for port
80/tcp masked as 'www'.
This patch update configure and configure.in to look for service 'http' instead
of 'www'.

[Andreas Moog (ampelbein)]

You said on the debian report that you uploaded a NMU for this. I guess in that case we can wait the 3 days and sync from debian. What do you think?

review: Needs Information

[Daniel Holbach (dholbach)]

This doesn't seem to have landed in Debian yet. Shall we get it in and sync once it lands there?

[Adam Conrad (adconrad)]

I'm marking this as merged because I intend to just sync the NMU from unstable as soon as it gets out of incoming.

=== modified file 'configure'
--- configure	2004-03-09 18:34:21 +0000
+++ configure	2012-02-27 23:52:19 +0000
@@ -1296,14 +1296,14 @@
 
 
 
-echo $ac_n "checking that service name for 80/tcp is www""... $ac_c" 1>&6
-echo "configure:1301: checking that service name for 80/tcp is www" >&5
-if $PERL_PATH -I$perllib -MSocket -e 'exit("www" eq getservbyport(80, "tcp")? 0 : 1)'
+echo $ac_n "checking that service name for 80/tcp is http""... $ac_c" 1>&6
+echo "configure:1301: checking that service name for 80/tcp is http" >&5
+if $PERL_PATH -I$perllib -MSocket -e 'exit("http" eq getservbyport(80, "tcp")? 0 : 1)'
 then
    echo "$ac_t""yes" 1>&6
 else
    echo "$ac_t""no" 1>&6
-   { echo "configure: error: Please change /etc/services so that the service name for 80/tcp is www with alias http" 1>&2; exit 1; }
+   { echo "configure: error: Please change /etc/services so that the service name for 80/tcp is http with alias www" 1>&2; exit 1; }
 fi
 
 trap '' 1 2 15
 
=== modified file 'configure.in'
--- configure.in	2004-03-09 18:34:21 +0000
+++ configure.in	2012-02-27 23:52:19 +0000
@@ -135,13 +135,13 @@
 
 dnl Checks for misc.
 
-AC_MSG_CHECKING(that service name for 80/tcp is www)
-if $PERL_PATH -I$perllib -MSocket -e 'exit("www" eq getservbyport(80, "tcp")? 0 : 1)'
+AC_MSG_CHECKING(that service name for 80/tcp is http)
+if $PERL_PATH -I$perllib -MSocket -e 'exit("http" eq getservbyport(80, "tcp")? 0 : 1)'
 then
    AC_MSG_RESULT(yes)
 else
    AC_MSG_RESULT(no)
-   AC_MSG_ERROR(Please change /etc/services so that the service name for 80/tcp is www with alias http, www-http)
+   AC_MSG_ERROR(Please change /etc/services so that the service name for 80/tcp is http with alias www, www-http)
 fi
 
 AC_OUTPUT(Makefile flowscan graphs.mf example/crontab util/locker util/add_ds.pl util/add_txrx util/event2vrule util/ip2hostname)
 
=== modified file 'debian/changelog'
--- debian/changelog	2009-05-13 18:27:03 +0000
+++ debian/changelog	2012-02-27 23:52:19 +0000
@@ -1,3 +1,9 @@
+flowscan (1.006-13ubuntu1) precise; urgency=low
+
+  * Fix configure looking for http service (LP: #935087).
+
+ -- Leo Iannacone <[e-mail]>  Sun, 19 Feb 2012 14:08:14 +0100
+
 flowscan (1.006-13) unstable; urgency=low
 
   * New maintainer (Closes: #402663).
 
=== modified file 'debian/control'
--- debian/control	2009-05-13 18:27:03 +0000
+++ debian/control	2012-02-27 23:52:19 +0000
@@ -1,7 +1,8 @@
 Source: flowscan
 Section: net
 Priority: optional
-Maintainer: Guillaume Delacour <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Guillaume Delacour <[e-mail]>
 Build-Depends-Indep: perl (>= 5.6.1), rrdtool, librrds-perl, libboulder-perl, libnet-patricia-perl (>= 1.010), libconfigreader-perl, libcflow-perl (>= 1.024), libhtml-table-perl, netbase, po-debconf, ksh | mksh | pdksh | zsh, autotools-dev
 Standards-Version: 3.8.1
 Homepage: http://net.doit.wisc.edu/~plonka/FlowScan/
 
=== added directory 'debian/patches'
=== added file 'debian/patches/fix-ftbfs-with-netbase-4.47.patch'
--- debian/patches/fix-ftbfs-with-netbase-4.47.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-ftbfs-with-netbase-4.47.patch	2012-02-27 23:52:19 +0000
@@ -0,0 +1,53 @@
+Description: In netbase port 80/tcp is marked as 'http', no longer as 'www'.
+ This causes flowscan to fail during build while configure search for port 
+ 80/tcp masked as 'www'.
+ This patch update configure and configure.in to look for service 'http' instead
+ 'www'.
+Author: Leo Iannacone <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/935087
+
+---
+ configure    |    8 ++++----
+ configure.in |    6 +++---
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+--- flowscan.orig/configure
++++ flowscan/configure
+@@ -1296,14 +1296,14 @@ fi
+ 
+ 
+ 
+-echo $ac_n "checking that service name for 80/tcp is www""... $ac_c" 1>&6
+-echo "configure:1301: checking that service name for 80/tcp is www" >&5
+-if $PERL_PATH -I$perllib -MSocket -e 'exit("www" eq getservbyport(80, "tcp")? 0 : 1)'
++echo $ac_n "checking that service name for 80/tcp is http""... $ac_c" 1>&6
++echo "configure:1301: checking that service name for 80/tcp is http" >&5
++if $PERL_PATH -I$perllib -MSocket -e 'exit("http" eq getservbyport(80, "tcp")? 0 : 1)'
+ then
+    echo "$ac_t""yes" 1>&6
+ else
+    echo "$ac_t""no" 1>&6
+-   { echo "configure: error: Please change /etc/services so that the service name for 80/tcp is www with alias http" 1>&2; exit 1; }
++   { echo "configure: error: Please change /etc/services so that the service name for 80/tcp is http with alias www" 1>&2; exit 1; }
+ fi
+ 
+ trap '' 1 2 15
+--- flowscan.orig/configure.in
++++ flowscan/configure.in
+@@ -135,13 +135,13 @@ dnl Checks for library functions.
+ 
+ dnl Checks for misc.
+ 
+-AC_MSG_CHECKING(that service name for 80/tcp is www)
+-if $PERL_PATH -I$perllib -MSocket -e 'exit("www" eq getservbyport(80, "tcp")? 0 : 1)'
++AC_MSG_CHECKING(that service name for 80/tcp is http)
++if $PERL_PATH -I$perllib -MSocket -e 'exit("http" eq getservbyport(80, "tcp")? 0 : 1)'
+ then
+    AC_MSG_RESULT(yes)
+ else
+    AC_MSG_RESULT(no)
+-   AC_MSG_ERROR(Please change /etc/services so that the service name for 80/tcp is www with alias http, www-http)
++   AC_MSG_ERROR(Please change /etc/services so that the service name for 80/tcp is http with alias www, www-http)
+ fi
+ 
+ AC_OUTPUT(Makefile flowscan graphs.mf example/crontab util/locker util/add_ds.pl util/add_txrx util/event2vrule util/ip2hostname)
 
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2012-02-27 23:52:19 +0000
@@ -0,0 +1,1 @@
+fix-ftbfs-with-netbase-4.47.patch