diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-proxy/bfilter/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-proxy/bfilter/files')
-rw-r--r-- | net-proxy/bfilter/files/bfilter-1.1.4-external-boost.patch | 63 | ||||
-rw-r--r-- | net-proxy/bfilter/files/bfilter-1.1.4-glib-2.32.patch | 39 | ||||
-rw-r--r-- | net-proxy/bfilter/files/bfilter-1.1.4-gtkmm-X11-underlinking.patch | 12 | ||||
-rw-r--r-- | net-proxy/bfilter/files/bfilter.conf | 4 | ||||
-rw-r--r-- | net-proxy/bfilter/files/bfilter.init | 36 | ||||
-rw-r--r-- | net-proxy/bfilter/files/forwarding-proxy.xml | 19 | ||||
-rw-r--r-- | net-proxy/bfilter/files/forwarding.xml | 5 |
7 files changed, 178 insertions, 0 deletions
diff --git a/net-proxy/bfilter/files/bfilter-1.1.4-external-boost.patch b/net-proxy/bfilter/files/bfilter-1.1.4-external-boost.patch new file mode 100644 index 000000000000..6f185ca9f41b --- /dev/null +++ b/net-proxy/bfilter/files/bfilter-1.1.4-external-boost.patch @@ -0,0 +1,63 @@ +diff -Nru bfilter-1.1.4.orig/configure.in bfilter-1.1.4/configure.in +--- bfilter-1.1.4.orig/configure.in 2007-11-11 23:14:49.000000000 +0100 ++++ bfilter-1.1.4/configure.in 2009-10-18 18:26:32.000000000 +0200 +@@ -260,11 +260,6 @@ + Makefile + binreloc/Makefile + foundation/Makefile +-boost/Makefile +-boost/libs/Makefile +-boost/libs/regex/Makefile +-boost/libs/program_options/Makefile +-boost/libs/test/Makefile + reactor/Makefile + mkskel/Makefile + lexgen/Makefile +diff -Nru bfilter-1.1.4.orig/main/daemon/Makefile.am bfilter-1.1.4/main/daemon/Makefile.am +--- bfilter-1.1.4.orig/main/daemon/Makefile.am 2007-01-19 20:21:02.000000000 +0100 ++++ bfilter-1.1.4/main/daemon/Makefile.am 2009-10-18 18:25:52.000000000 +0200 +@@ -6,7 +6,7 @@ + $(top_builddir)/boost/libs/program_options/libprogram_options.la + else + BOOST_CPPFLAGS = +-BOOST_LIBS = ++BOOST_LIBS = -lboost_regex-mt -lboost_program_options-mt + endif + + AM_CPPFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\" \ +diff -Nru bfilter-1.1.4.orig/main/gui/gtk/Makefile.am bfilter-1.1.4/main/gui/gtk/Makefile.am +--- bfilter-1.1.4.orig/main/gui/gtk/Makefile.am 2008-06-02 17:25:27.000000000 +0200 ++++ bfilter-1.1.4/main/gui/gtk/Makefile.am 2009-10-18 18:25:52.000000000 +0200 +@@ -50,7 +50,7 @@ + BOOST_LIBS = $(top_builddir)/boost/libs/regex/libregex.la + else + BOOST_CPPFLAGS = +-BOOST_LIBS = ++BOOST_LIBS = -lboost_regex-mt + endif + + if WITH_GUI +diff -Nru bfilter-1.1.4.orig/Makefile.am bfilter-1.1.4/Makefile.am +--- bfilter-1.1.4.orig/Makefile.am 2007-11-11 23:16:04.000000000 +0100 ++++ bfilter-1.1.4/Makefile.am 2009-10-18 18:26:46.000000000 +0200 +@@ -1,7 +1,7 @@ + EXTRA_DIST = doc cmake bootstrap m4 VERSION CMakeLists.txt types.h pstdint.h \ + config.h.cm bfilter.desktop bfilter.png Doxyfile + DISTCLEANFILES = itypes.h +-SUBDIRS = binreloc foundation boost reactor mkskel lexgen libjs main conf \ ++SUBDIRS = binreloc foundation reactor mkskel lexgen libjs main conf \ + packaging tests + + dist_man_MANS = bfilter.8 +diff -Nru bfilter-1.1.4.orig/tests/Makefile.am bfilter-1.1.4/tests/Makefile.am +--- bfilter-1.1.4.orig/tests/Makefile.am 2007-05-07 16:19:40.000000000 +0200 ++++ bfilter-1.1.4/tests/Makefile.am 2009-10-18 18:25:52.000000000 +0200 +@@ -6,7 +6,7 @@ + $(top_builddir)/boost/libs/regex/libregex.la + else + BOOST_CPPFLAGS = +-BOOST_LIBS = ++BOOST_LIBS = -lboost_regex-mt -lboost_unit_test_framework-mt + endif + + AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \ diff --git a/net-proxy/bfilter/files/bfilter-1.1.4-glib-2.32.patch b/net-proxy/bfilter/files/bfilter-1.1.4-glib-2.32.patch new file mode 100644 index 000000000000..7b4068b758e3 --- /dev/null +++ b/net-proxy/bfilter/files/bfilter-1.1.4-glib-2.32.patch @@ -0,0 +1,39 @@ +Index: bfilter-1.1.4/main/gui/gtk/CompiledImage.h +=================================================================== +--- bfilter-1.1.4.orig/main/gui/gtk/CompiledImage.h ++++ bfilter-1.1.4/main/gui/gtk/CompiledImage.h +@@ -24,7 +24,7 @@ + #include <config.h> + #endif + +-#include <glib/gtypes.h> ++#include <glib.h> + #include <glibmm/refptr.h> + #include <gdkmm/pixbuf.h> + #include <stddef.h> +Index: bfilter-1.1.4/main/gui/gtk/TrayMenu.h +=================================================================== +--- bfilter-1.1.4.orig/main/gui/gtk/TrayMenu.h ++++ bfilter-1.1.4/main/gui/gtk/TrayMenu.h +@@ -25,7 +25,7 @@ + #endif + + #include "NonCopyable.h" +-#include <glib/gtypes.h> ++#include <glib.h> + #include <memory> + + namespace GtkGUI +Index: bfilter-1.1.4/main/gui/gtk/img2src.sh +=================================================================== +--- bfilter-1.1.4.orig/main/gui/gtk/img2src.sh ++++ bfilter-1.1.4/main/gui/gtk/img2src.sh +@@ -4,7 +4,7 @@ cat <<END + /* This file was generated by img2src.sh */ + + #include "CompiledImage.h" +-#include <glib/gtypes.h> ++#include <glib.h> + + END + diff --git a/net-proxy/bfilter/files/bfilter-1.1.4-gtkmm-X11-underlinking.patch b/net-proxy/bfilter/files/bfilter-1.1.4-gtkmm-X11-underlinking.patch new file mode 100644 index 000000000000..2a474e5d3867 --- /dev/null +++ b/net-proxy/bfilter/files/bfilter-1.1.4-gtkmm-X11-underlinking.patch @@ -0,0 +1,12 @@ +diff -Naur -u a/configure.in b/configure.in +--- a/configure.in 2013-11-30 17:03:04.733971428 +0100 ++++ b/configure.in 2013-11-30 17:03:21.231971410 +0100 +@@ -205,7 +205,7 @@ + [ with_gui="no" ]) + AM_CONDITIONAL(WITH_GUI, [test "$with_gui" = "yes"]) + if test "$with_gui" = "yes"; then +- PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.4) ++ PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.4 x11) + dnl PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.0) + dnl GTKMM_LIBS="$GTKMM_LIBS $GTHREAD_LIBS" + AC_SUBST(GTKMM_CFLAGS) diff --git a/net-proxy/bfilter/files/bfilter.conf b/net-proxy/bfilter/files/bfilter.conf new file mode 100644 index 000000000000..3c533b418eae --- /dev/null +++ b/net-proxy/bfilter/files/bfilter.conf @@ -0,0 +1,4 @@ +# Config file for /etc/init.d/bfilter + +# See the bfilter(8) man page for possible options to put here. +BFILTER_OPTS="-u bfilter -g bfilter -r /etc/bfilter" diff --git a/net-proxy/bfilter/files/bfilter.init b/net-proxy/bfilter/files/bfilter.init new file mode 100644 index 000000000000..76437f6b41eb --- /dev/null +++ b/net-proxy/bfilter/files/bfilter.init @@ -0,0 +1,36 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +depend() { + need net +} + +checkresolvconf() { + #make /etc/bfilter/etc/resolv.conf if chroot is set + if [ "${BFILTER_OPTS#* -r *}" != "${BFILTER_OPTS}" ] ; then + local CHROOTDIR="${BFILTER_OPTS#* -r }" + CHROOTDIR="${CHROOTDIR%% *}" + mkdir -p "${CHROOTDIR}/etc" || return 1 + if ! cmp -s /etc/resolv.conf "${CHROOTDIR}/etc/resolv.conf" ; then + cp -p /etc/resolv.conf "${CHROOTDIR}/etc/resolv.conf" || return 1 + fi + fi + + return 0 +} + +start() { + checkresolvconf || return 1 + + ebegin "Starting bfilter" + start-stop-daemon --start --quiet --exec /usr/bin/bfilter -- ${BFILTER_OPTS} + eend $? +} + +stop() { + ebegin "Stopping bfilter" + start-stop-daemon --stop --quiet --exec /usr/bin/bfilter + eend $? +} diff --git a/net-proxy/bfilter/files/forwarding-proxy.xml b/net-proxy/bfilter/files/forwarding-proxy.xml new file mode 100644 index 000000000000..dafcbb1ed664 --- /dev/null +++ b/net-proxy/bfilter/files/forwarding-proxy.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<forwarding> + <option name="Direct"> + </option> + <option name="ISP Proxy" selected="selected"> + <bypass> + <simple-hostnames/> + <host-mask>*.isp.com</host-mask> + <host-mask>192.168.*</host-mask> + </bypass> + <proxy-chain> + <proxy> + <type>socks4</type><!-- available types: http, socks4, socks4a and socks5 --> + <host>localhost</host> + <port>9050</port> + </proxy> + </proxy-chain> + </option> +</forwarding> diff --git a/net-proxy/bfilter/files/forwarding.xml b/net-proxy/bfilter/files/forwarding.xml new file mode 100644 index 000000000000..9b62c6bfc4a9 --- /dev/null +++ b/net-proxy/bfilter/files/forwarding.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<forwarding> + <option name="Direct" selected="selected"> + </option> +</forwarding> |