| 1 |
tomwij 13/11/30 16:28:06 |
| 2 |
|
| 3 |
Modified: bfilter.init |
| 4 |
Added: bfilter-1.1.4-gtkmm-X11-underlinking.patch |
| 5 |
Log: |
| 6 |
Fix bashism in init script. Patch gtkmm X11 underlinking; fixes bug #489328, reported by Mark (chaseguard). |
| 7 |
|
| 8 |
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.3 net-proxy/bfilter/files/bfilter.init |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/bfilter/files/bfilter.init?rev=1.3&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/bfilter/files/bfilter.init?rev=1.3&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/bfilter/files/bfilter.init?r1=1.2&r2=1.3 |
| 16 |
|
| 17 |
Index: bfilter.init |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/net-proxy/bfilter/files/bfilter.init,v |
| 20 |
retrieving revision 1.2 |
| 21 |
retrieving revision 1.3 |
| 22 |
diff -u -r1.2 -r1.3 |
| 23 |
--- bfilter.init 5 Mar 2006 08:31:31 -0000 1.2 |
| 24 |
+++ bfilter.init 30 Nov 2013 16:28:06 -0000 1.3 |
| 25 |
@@ -1,7 +1,7 @@ |
| 26 |
#!/sbin/runscript |
| 27 |
-# Copyright 1999-2005 Gentoo Foundation |
| 28 |
+# Copyright 1999-2013 Gentoo Foundation |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/bfilter/files/bfilter.init,v 1.2 2006/03/05 08:31:31 mrness Exp $ |
| 31 |
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/bfilter/files/bfilter.init,v 1.3 2013/11/30 16:28:06 tomwij Exp $ |
| 32 |
|
| 33 |
depend() { |
| 34 |
need net |
| 35 |
@@ -9,7 +9,7 @@ |
| 36 |
|
| 37 |
checkresolvconf() { |
| 38 |
#make /etc/bfilter/etc/resolv.conf if chroot is set |
| 39 |
- if [[ ${BFILTER_OPTS} == *" -r "* ]] ; then |
| 40 |
+ if [ "${BFILTER_OPTS#* -r *}" != "${BFILTER_OPTS}" ] ; then |
| 41 |
local CHROOTDIR="${BFILTER_OPTS#* -r }" |
| 42 |
CHROOTDIR="${CHROOTDIR%% *}" |
| 43 |
mkdir -p "${CHROOTDIR}/etc" || return 1 |
| 44 |
|
| 45 |
|
| 46 |
|
| 47 |
1.1 net-proxy/bfilter/files/bfilter-1.1.4-gtkmm-X11-underlinking.patch |
| 48 |
|
| 49 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/bfilter/files/bfilter-1.1.4-gtkmm-X11-underlinking.patch?rev=1.1&view=markup |
| 50 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/bfilter/files/bfilter-1.1.4-gtkmm-X11-underlinking.patch?rev=1.1&content-type=text/plain |
| 51 |
|
| 52 |
Index: bfilter-1.1.4-gtkmm-X11-underlinking.patch |
| 53 |
=================================================================== |
| 54 |
diff -Naur -u a/configure.in b/configure.in |
| 55 |
--- a/configure.in 2013-11-30 17:03:04.733971428 +0100 |
| 56 |
+++ b/configure.in 2013-11-30 17:03:21.231971410 +0100 |
| 57 |
@@ -205,7 +205,7 @@ |
| 58 |
[ with_gui="no" ]) |
| 59 |
AM_CONDITIONAL(WITH_GUI, [test "$with_gui" = "yes"]) |
| 60 |
if test "$with_gui" = "yes"; then |
| 61 |
- PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.4) |
| 62 |
+ PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.4 x11) |
| 63 |
dnl PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.0) |
| 64 |
dnl GTKMM_LIBS="$GTKMM_LIBS $GTHREAD_LIBS" |
| 65 |
AC_SUBST(GTKMM_CFLAGS) |
Archives