OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Dec-2004 10:32:22
Branch: HEAD Handle: 2004122509322200
Modified files:
openpkg-src/flowtools flowtools.patch flowtools.spec
Log:
switch to more silent compilation (we are the packager, not the
developer) and print more reasonable errors on bind() failure in
flow-fanout
Summary:
Revision Changes Path
1.7 +30 -4 openpkg-src/flowtools/flowtools.patch
1.8 +4 -1 openpkg-src/flowtools/flowtools.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/flowtools/flowtools.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 flowtools.patch
--- openpkg-src/flowtools/flowtools.patch 24 Dec 2004 20:56:08 -0000
1.6
+++ openpkg-src/flowtools/flowtools.patch 25 Dec 2004 09:32:22 -0000
1.7
@@ -1,7 +1,15 @@
Index: flow-tools-0.67/configure
--- flow-tools-0.67/configure.orig 2003-12-04 07:19:41 +0100
+++ flow-tools-0.67/configure 2004-12-24 21:23:56 +0100
-@@ -3209,7 +3209,7 @@
+@@ -1674,7 +1674,6 @@
+ ac_config_headers="$ac_config_headers
lib/ftconfig.h:lib/ftconfig.h.in"
+
+
+-CFLAGS="-g -Wall"
+
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -3209,7 +3208,7 @@
if test "x$WHERE_MYSQL" != "x"; then
@@ -10,7 +18,7 @@
echo "$as_me:$LINENO: checking for my_init in -lmysqlclient" >&5
echo $ECHO_N "checking for my_init in -lmysqlclient... $ECHO_C" >&6
if test "${ac_cv_lib_mysqlclient_my_init+set}" = set; then
-@@ -3279,7 +3279,7 @@
+@@ -3279,7 +3278,7 @@
fi
if test "x$WHERE_PGSQL" != "x"; then
@@ -19,7 +27,7 @@
echo "$as_me:$LINENO: checking for PQsetdbLogin in -lpq" >&5
echo $ECHO_N "checking for PQsetdbLogin in -lpq... $ECHO_C" >&6
if test "${ac_cv_lib_pq_PQsetdbLogin+set}" = set; then
-@@ -3336,7 +3336,7 @@
+@@ -3336,7 +3335,7 @@
echo "${ECHO_T}$ac_cv_lib_pq_PQsetdbLogin" >&6
if test $ac_cv_lib_pq_PQsetdbLogin = yes; then
@@ -88,7 +96,25 @@
Index: flow-tools-0.67/src/flow-fanout.c
--- flow-tools-0.67/src/flow-fanout.c.orig 2003-12-01 00:38:37 +0100
-+++ flow-tools-0.67/src/flow-fanout.c 2004-12-17 17:46:49 +0100
++++ flow-tools-0.67/src/flow-fanout.c 2004-12-24 22:07:56 +0100
+@@ -486,7 +486,7 @@
+ /* unicast bind -- multicast support */
+ if (bind(ftnet.fd, (struct sockaddr*)&ftnet.loc_addr,
+ sizeof(ftnet.loc_addr)) < 0)
+- fterr_err(1, "bind()");
++ fterr_err(1, "bind(%s)", inet_ntoa(ftnet.loc_addr.sin_addr));
+
+ } /* not multicast group */
+
+@@ -499,7 +499,7 @@
+ /* unicast bind -- no multicast support */
+ if (bind(ftnet.fd, (struct sockaddr*)&ftnet.loc_addr,
+ sizeof(ftnet.loc_addr)) < 0)
+- fterr_err(1, "bind()");
++ fterr_err(1, "bind(%s)", inet_ntoa(ftnet.loc_addr.sin_addr));
+
+ #endif /* IP_ADD_MEMBERSHIP */
+
@@ -839,7 +839,7 @@
} /* fte.buf_size */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/flowtools/flowtools.spec
============================================================================
$ cvs diff -u -r1.7 -r1.8 flowtools.spec
--- openpkg-src/flowtools/flowtools.spec 24 Dec 2004 20:56:09 -0000
1.7
+++ openpkg-src/flowtools/flowtools.spec 25 Dec 2004 09:32:22 -0000
1.8
@@ -39,7 +39,7 @@
Group: Network
License: BSD
Version: %{V_flowtools}
-Release: 20041224
+Release: 20041225
# package options
%option with_fsl yes
@@ -117,6 +117,9 @@
%build
# build flow-tools
( cd flow-tools-%{V_flowtools}
+ %{l_shtool} subst \
+ -e 's;-g -Wall;;' \
+ Makefile.in */Makefile.in
export CC="%{l_cc}"
export CFLAGS="%{l_cflags -O}"
export CPPFLAGS="%{l_cppflags}"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
