diff options
Diffstat (limited to 'net-misc')
26 files changed, 0 insertions, 2923 deletions
diff --git a/net-misc/stargazer/Manifest b/net-misc/stargazer/Manifest deleted file mode 100644 index 6c0b4e25b4f7..000000000000 --- a/net-misc/stargazer/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST stg-2.408.tar.gz 5100291 BLAKE2B c5e50d5607f7c5253dcbb9d48fffdd55bf44829bfc3dba1e45227fa819d2592212366baff6b19dce70ef7a565f8b03e8f580204225441b12653de6271a030554 SHA512 200e08cfd629dbacda31ffd3134c2908a1ad58604421cc288ad0ec1bdcd60fe021d51fed50fdc2517bb7c2b61ef23b0b9c71a606babd09bc7804cb899e0b7f75 diff --git a/net-misc/stargazer/files/logrotate b/net-misc/stargazer/files/logrotate deleted file mode 100644 index ffa9c23f3012..000000000000 --- a/net-misc/stargazer/files/logrotate +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/stargazer/*.log { - daily - rotate 31 - compress - missingok - notifempty - copytruncate - sharedscripts -} diff --git a/net-misc/stargazer/files/mans/rscriptd.8 b/net-misc/stargazer/files/mans/rscriptd.8 deleted file mode 100644 index 440f7b0267b1..000000000000 --- a/net-misc/stargazer/files/mans/rscriptd.8 +++ /dev/null @@ -1,51 +0,0 @@ -.TH rscriptd 8 "December 31, 2012" "" "rscriptd" - -.SH NAME -rscriptd \- a remote script execute daemon for Stargazer - -.SH SYNOPSIS -.B rscriptd -.RI [ config-file ] -.br - -.SH DESCRIPTION -The -.B rscriptd -daemon typically runs on a last-wire router before users and -manages firewall rules to allow/disallow users get their services. -.B rscriptd -communicates with -.B Stargazer -main daemon by UDP protocol. - -.SH OPTIONS -.TP -.I config-file -Path to rscriptd configuration file. Default is -.B -/etc/rscriptd/rscriptd.conf - -.SH FILES -.B -/usr/sbin/rsriptd -.br -.B -/etc/stargazer/rscriptd.conf -.br -.B -/var/log/stargazer/rscriptd.log - -.SH SEE ALSO -.BR sgconf (1), -.BR sgconf_xml (1), -.BR sgconv (1), -.BR sgauth (8), -.BR stargazer (8). - -.SH AUTHOR -rscriptd was originally written by Boris Mikhailenko <stg34@stargazer.dp.ua> and -Maxim Mamontov <faust@stargazer.dp.ua>. -.PP -This manual page was written by Alexey Osipov <simba@lerlan.ru>, -for the Debian project (and may be used by others), and was modified by -Vladimir Pavljuchenkov <spiderx@spiderx.dp.ua> for Gentoo Linux
\ No newline at end of file diff --git a/net-misc/stargazer/files/mans/sgauth.8 b/net-misc/stargazer/files/mans/sgauth.8 deleted file mode 100644 index 24c872761f7e..000000000000 --- a/net-misc/stargazer/files/mans/sgauth.8 +++ /dev/null @@ -1,54 +0,0 @@ -.TH sgauth 1 "December 31, 2012" "" "sgauth" - -.SH NAME -sgauth \- a command-line utility for authorization in Stargazer - -.SH SYNOPSIS -.B sgauth -.RI [ config-file ] -.br - -.SH DESCRIPTION -.B sgauth -allow user to become authorized in -.B Stargazer -billing system. -.PP -.B sgauth -reads the -.IR config-file , -connects to -.B Stargazer -server and authentificates on it using data supplied in -.IR config-file . -In addition, it runs a simple http-server on port 5580, capable of -monitoring and controlling the connection (if specified in -.IR config-file ")." - -.SH OPTIONS -.TP -.I config-file -Path to file containing user login, password and other configuration data. Default is -.B -/etc/sgauth.conf - -.SH FILES -.B -/usr/sbin/sgauth -.br -.B -/etc/stargazer/sgauth.conf - -.SH SEE ALSO -.BR sgconf (1), -.BR sgconf_xml (1), -.BR sgconv (1), -.BR stargazer (8), -.BR rscriptd (8). - -.SH AUTHOR -sgauth was initially written by Boris Mikhailenko <stg34@stargazer.dp.ua>. -.PP -This manual page was written by Alexey Osipov <simba@lerlan.ru>, -for the Debian project (and may be used by others), and was modified by -Vladimir Pavljuchenkov <spiderx@spiderx.dp.ua> for Gentoo Linux
\ No newline at end of file diff --git a/net-misc/stargazer/files/mans/sgconf.1 b/net-misc/stargazer/files/mans/sgconf.1 deleted file mode 100644 index 4017d9e59648..000000000000 --- a/net-misc/stargazer/files/mans/sgconf.1 +++ /dev/null @@ -1,160 +0,0 @@ -.TH sgconf 1 "December 31, 2012" "" "sgconf" - -.SH NAME -sgconf \- a command-line utility for configuring Stargazer - -.SH SYNOPSIS -.B sgconf -( -.I get -| -.I set -) -.BI \-s " server" -.BI \-p " port" -.BI \-a " admin" -.BI \-w " admin-pass" -.BI \-u " user" -.I special-options -.br - -.SH DESCRIPTION -.B sgconf -allows -.B Stargazer -system administrators to configure users. -.PP -.B sgconf -support two subset of commands - -.I get -and -.IR set . -.I get -commands are for reading actual values from -.B Stargazer -and -.I set -commands are for writing new values to -.BR Stargazer . - -.SH OPTIONS -.TP -.BI \-s " server" -IP or hostname where -.B Stargazer -server run. -.TP -.BI \-p " port" -Port, which -.B Stargazer -listen for configuration connections (typically 5555). -.TP -.BI \-a " admin" -Administrator login. -.TP -.BI \-w " admin-pass" -Administrator password. -.TP -.TP -.IR special-options " are following:" -(Use without argument for -.IR get ")" -.TP -.BI \-c " add_cash[:log message]" -Get user's balance or add money to user's balance with optional log message. -.TP -.BI \-v " set_cash[:log message]" -Set user's balance with optional log message. -.TP -.BI \-t " tariff:now|delayed" -Get/set user's tariff. If -.I now -specified, the change is immediate. If -.I delayed -specified, the change will happen at end of the month. -.TP -.BI \-r " credit" -Get/set user's maximum credit. -.TP -.BI \-o " password" -Get/set user's password. -.TP -.BI \-e " prepaid" -Get/set amount of user's prepaid traffic. -.TP -.BI \-I " *|ip_addr[,ip_addr...]" -Get/set user's allowed IP addresses. Asterisk mark means "any address". -.TP -.BI \-A " name" -Get/set user's name. -.TP -.BI \-N " note" -Get/set user's note. -.TP -.BI \-D " address" -Get/set user's street address. -.TP -.BI \-L " email" -Get/set user's email. -.TP -.BI \-P " phone" -Get/set user's phone. -.TP -.BI \-G " group" -Get/set group, user belongs to. -.TP -.BI \-d " 0|1" -Get/set user's "down" ("disabled") flag. -.TP -.BI \-i " 0|1" -Get/set user's "passive" ("frozen") flag. -.TP -.BI \-\-disable\-stat " 0|1" -Get/set user's "disableDetailStat" flag. -.TP -.BI \-\-always\-online " 0|1" -Get/set user's "alwaysOnline" flag. -.TP -.BI \-\-u "X traffic" -Get/set user's upload traffic for -.I X -service (direction). -.TP -.BI \-\-d "X traffic" -Get/set user's download traffic for -.I X -service (direction). -.TP -.BI \-\-ud "X userdata" -Get/set user's -.I X -custom data. -.TP -.BI \-m " message" -Send -.I message -to user. -.TP -.B \-n -Create new user. -.TP -.B \-l -Delete user. - -.SH FILES -.B -/usr/bin/sgconf - -.SH SEE ALSO -.BR sgauth (8), -.BR sgconf_xml (1), -.BR sgconv (1), -.BR stargazer (8), -.BR rscriptd (8). - -.SH AUTHOR -sgconf was initially written by Boris Mikhailenko <stg34@stargazer.dp.ua>. -.PP -This manual page was written by Alexey Osipov <simba@lerlan.ru>, -for the Debian project (and may be used by others), and was modified by -Vladimir Pavljuchenkov <spiderx@spiderx.dp.ua> for Gentoo Linux
\ No newline at end of file diff --git a/net-misc/stargazer/files/mans/sgconf_xml.1 b/net-misc/stargazer/files/mans/sgconf_xml.1 deleted file mode 100644 index 428fadfd5b18..000000000000 --- a/net-misc/stargazer/files/mans/sgconf_xml.1 +++ /dev/null @@ -1,79 +0,0 @@ -.TH sgconf_xml 1 "December 31, 2012" "" "sgconf_xml" - -.SH NAME -sgconf_xml \- a command-line xml-based utility for configuring Stargazer - -.SH SYNOPSIS -.B sgconf_xml -.BI \-s " server" -.BI \-p " port" -.BI \-a " admin" -.BI \-w " admin-pass" -( -.BI \-r " request-string" -| -.BI \-f " request-file" -) - -.SH DESCRIPTION -.B sgconf_xml -allows system administrators to configure -.BR Stargazer . -.PP -.B sgconf_xml -uses XML for requests and responses. You can specify a -file containing XML request by using -.B \-f -option, or you can specify XML request directly as a -string by using -.B \-r -option. - -.SH OPTIONS -.TP -.BI \-s " server" -IP or hostname where -.B Stargazer -server run. -.TP -.BI \-p " port" -Port, which -.B Stargazer -listen for configuration connections (typically 5555). -.TP -.BI \-a " admin" -Administrator login. -.TP -.BI \-w " admin-pass" -Administrator password. -.TP -.BI \-r " request-string" -The request in form of XML. -.TP -.BI \-f " request-file" -File containing request in form of XML. - -.SH REQUEST SYNTAX -TODO. -.br -As for now you can check an example by running -.B sgconf_xml -without arguments. - -.SH FILES -.B -/usr/bin/sgconf_xml - -.SH SEE ALSO -.BR sgauth (8), -.BR sgconf (1), -.BR sgconv (1), -.BR stargazer (8), -.BR rscriptd (8). - -.SH AUTHOR -sgconf_xml was initially written by Boris Mikhailenko <stg34@stargazer.dp.ua>. -.PP -This manual page was written by Alexey Osipov <simba@lerlan.ru>, -for the Debian project (and may be used by others), and was modified by -Vladimir Pavljuchenkov <spiderx@spiderx.dp.ua> for Gentoo Linux
\ No newline at end of file diff --git a/net-misc/stargazer/files/mans/sgconv.1 b/net-misc/stargazer/files/mans/sgconv.1 deleted file mode 100644 index b5fb225ab064..000000000000 --- a/net-misc/stargazer/files/mans/sgconv.1 +++ /dev/null @@ -1,42 +0,0 @@ -.TH sgconv 1 "December 31, 2012" "" "sgconv" - -.SH NAME -sgconv \- an utility to convert Stargazer data between storage backends - -.SH SYNOPSIS -.B sgconv -.RI [ config-file ] - -.SH DESCRIPTION -.B sgconv -allows system administrators to copy and merge -.B Stargazer -data from one storage backend to another. - -.SH OPTIONS -.TP -.I config-file -A path to config file containing convertion parameters. Default is -.B sgconv.conf -in current directory. - -.SH FILES -.B -/usr/bin/sgconv -.br -.B -/etc/stargazer/sgconv.conf - -.SH SEE ALSO -.BR sgauth (8), -.BR sgconf (1), -.BR sgconf_xml (1), -.BR stargazer (8), -.BR rscriptd (8). - -.SH AUTHOR -sgconv was initially written by Maxim Mamontov <faust@stargazer.dp.ua>. -.PP -This manual page was written by Alexey Osipov <simba@lerlan.ru>, -for the Debian project (and may be used by others), and was modified by -Vladimir Pavljuchenkov <spiderx@spiderx.dp.ua> for Gentoo Linux
\ No newline at end of file diff --git a/net-misc/stargazer/files/mans/stargazer.8 b/net-misc/stargazer/files/mans/stargazer.8 deleted file mode 100644 index a1860c5d97b9..000000000000 --- a/net-misc/stargazer/files/mans/stargazer.8 +++ /dev/null @@ -1,64 +0,0 @@ -.TH stargazer 8 "December 31, 2012" "" "stargazer" - -.SH NAME -stargazer \- a powerfull billing system daemon - -.SH SYNOPSIS -.B stargazer -.RI [ config-directory ] -.br - -.SH DESCRIPTION -This manual page explains the -.B stargazer -daemon. This daemon address ISP user accounting and billing problems. -.PP -.B Stargazer -is capable of: -.PP -- manage user accounts using several kinds of stores (plain files, MySQL, Firebird, -PostgreSQL) -.br -- gather traffic flow information using several methods (Netflow protocol, rawsocket -ethernet packets capture, netfilter IPQ capture) -.br -- bill user accounts according to rate rules and traffic classification -.br -- authentificate and authorize users to get access to the internet - -.SH OPTIONS -.TP -.I config-directory -Path to directory containing stargazer configuration files. Default is -.B -/etc/stargazer - -.SH FILES -.B -/usr/sbin/stargazer -.br -.B -/etc/stargazer/ -.br -.B -/var/lib/stargazer/ -.br -.B -/var/log/stargazer/stargazer.log -.br -.B -/var/log/stargazer/xmlrpc.log - -.SH SEE ALSO -.BR sgconf (1), -.BR sgconf_xml (1), -.BR sgconv (1), -.BR sgauth (8), -.BR rscriptd (8). - -.SH AUTHOR -stargazer was initially written by Boris Mikhailenko <stg34@stargazer.dp.ua>. -.PP -This manual page was written by Alexey Osipov <simba@lerlan.ru>, -for the Debian project (and may be used by others), and was modified by -Vladimir Pavljuchenkov <spiderx@spiderx.dp.ua> for Gentoo Linux
\ No newline at end of file diff --git a/net-misc/stargazer/files/patches/stg-2.408-build-upstream.patch b/net-misc/stargazer/files/patches/stg-2.408-build-upstream.patch deleted file mode 100644 index 6f2c43e74988..000000000000 --- a/net-misc/stargazer/files/patches/stg-2.408-build-upstream.patch +++ /dev/null @@ -1,214 +0,0 @@ ---- a/projects/rlm_stg/build.org 2013-01-15 15:25:59.000000000 +0200 -+++ b/projects/rlm_stg/build 2013-01-15 19:48:13.000000000 +0200 -@@ -16,21 +16,15 @@ - DIR_MODE=0755 - OWNER=root - --if [ -z $1 ] --then -- MAKEOPTS="-j1" -- DEBUG="no" -+if [ "$1" = "debug" ] -+then -+ DEFS="$DEFS -DDEBUG" -+ MAKEOPTS="$MAKEOPTS -j1" -+ CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -Wextra" -+ DEBUG="yes" - else -- if [ "$1" = "debug" ] -- then -- DEFS="-DDEBUG" -- MAKEOPTS="-j1" -- CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall" -- DEBUG="yes" -- else -- MAKEOPTS="-j1" -- DEBUG="no" -- fi -+ DEFS="$DEFS -DNDEBUG" -+ DEBUG="no" - fi - - CXXFLAGS="$CXXFLAGS -I/usr/local/include" ---- a/projects/rscriptd/build.org 2013-01-15 18:28:32.000000000 +0200 -+++ b/projects/rscriptd/build 2013-01-15 18:38:13.000000000 +0200 -@@ -16,21 +16,15 @@ - DIR_MODE=0755 - OWNER=root - --if [ -z $1 ] -+if [ "$1" = "debug" ] - then -- MAKEOPTS="-j1" -- DEBUG="no" -+ DEFS="$DEFS -DDEBUG" -+ MAKEOPTS="$MAKEOPTS -j1" -+ CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -Wextra" -+ DEBUG="yes" - else -- if [ "$1" = "debug" ] -- then -- DEFS="-DDEBUG" -- MAKEOPTS="-j1" -- CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall" -- DEBUG="yes" -- else -- MAKEOPTS="-j1" -- DEBUG="no" -- fi -+ DEFS="$DEFS -DNDEBUG" -+ DEBUG="no" - fi - - CXXFLAGS="$CXXFLAGS -I/usr/local/include" ---- a/projects/sgauth/build.org 2013-01-15 18:29:20.000000000 +0200 -+++ b/projects/sgauth/build 2013-01-15 18:36:33.000000000 +0200 -@@ -16,21 +16,15 @@ - DIR_MODE=0755 - OWNER=root - --if [ -z $1 ] -+if [ "$1" = "debug" ] - then -- MAKEOPTS="-j1" -- DEBUG="no" -+ DEFS="$DEFS -DDEBUG" -+ MAKEOPTS="$MAKEOPTS -j1" -+ CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -Wextra" -+ DEBUG="yes" - else -- if [ "$1" = "debug" ] -- then -- DEFS="-DDEBUG" -- MAKEOPTS="-j1" -- CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall" -- DEBUG="yes" -- else -- MAKEOPTS="-j1" -- DEBUG="no" -- fi -+ DEFS="$DEFS -DNDEBUG" -+ DEBUG="no" - fi - - CXXFLAGS="$CXXFLAGS -I/usr/local/include" ---- a/projects/sgconf/build.org 2013-01-15 18:29:59.000000000 +0200 -+++ b/projects/sgconf/build 2013-01-15 18:35:41.000000000 +0200 -@@ -16,21 +16,15 @@ - DIR_MODE=0755 - OWNER=root - --if [ -z $1 ] -+if [ "$1" = "debug" ] - then -- MAKEOPTS="-j1" -- DEBUG="no" -+ DEFS="$DEFS -DDEBUG" -+ MAKEOPTS="$MAKEOPTS -j1" -+ CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -Wextra" -+ DEBUG="yes" - else -- if [ "$1" = "debug" ] -- then -- DEFS="-DDEBUG" -- MAKEOPTS="-j1" -- CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall" -- DEBUG="yes" -- else -- MAKEOPTS="-j1" -- DEBUG="no" -- fi -+ DEFS="$DEFS -DNDEBUG" -+ DEBUG="no" - fi - - CXXFLAGS="$CXXFLAGS -I/usr/local/include" ---- a/projects/sgconf_xml/build.org 2013-01-15 18:30:26.000000000 +0200 -+++ b/projects/sgconf_xml/build 2013-01-15 18:34:53.000000000 +0200 -@@ -16,21 +16,15 @@ - DIR_MODE=0755 - OWNER=root - --if [ -z $1 ] -+if [ "$1" = "debug" ] - then -- MAKEOPTS="-j1" -- DEBUG="no" -+ DEFS="$DEFS -DDEBUG" -+ MAKEOPTS="$MAKEOPTS -j1" -+ CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -Wextra" -+ DEBUG="yes" - else -- if [ "$1" = "debug" ] -- then -- DEFS="-DDEBUG" -- MAKEOPTS="-j1" -- CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall" -- DEBUG="yes" -- else -- MAKEOPTS="-j1" -- DEBUG="no" -- fi -+ DEFS="$DEFS -DNDEBUG" -+ DEBUG="no" - fi - - CXXFLAGS="$CXXFLAGS -I/usr/local/include" ---- a/projects/sgconv/build.org 2013-01-15 18:31:01.000000000 +0200 -+++ b/projects/sgconv/build 2013-01-15 18:32:46.000000000 +0200 -@@ -16,11 +16,20 @@ - DIR_MODE=0755 - OWNER=root - VAR_DIR="./inst/var/stargazer" --DEFS="-DDEBUG" --MAKEOPTS="-j1" -+ -+if [ "$1" = "debug" ] -+then -+ DEFS="$DEFS -DDEBUG" -+ MAKEOPTS="$MAKEOPTS -j1" -+ CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -Wextra" -+ DEBUG="yes" -+else -+ DEFS="$DEFS -DNDEBUG" -+ DEBUG="no" -+fi -+ - CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -I/usr/local/include" - LDFLAGS="$LDFLAGS -L/usr/local/lib" --DEBUG="yes" - - if [ "$sys" = "Linux" ] - then ---- a/projects/stargazer/build.org 2013-01-15 19:48:54.000000000 +0200 -+++ b/projects/stargazer/build 2013-01-15 19:51:13.000000000 +0200 -@@ -35,23 +35,15 @@ - XMLRPC_FEATURES="c++2 abyss-server" - - --if [ -z "$1" ] -+if [ "$1" = "debug" ] - then -+ DEFS="$DEFS -DDEBUG" -+ MAKEOPTS="$MAKEOPTS -j1" -+ CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall" -+ DEBUG="yes" -+else - DEFS="$DEFS -DNDEBUG" -- MAKEOPTS="-j1" - DEBUG="no" --else -- if [ "$1" = "debug" ] -- then -- DEFS="$DEFS -DDEBUG" -- MAKEOPTS="-j1" -- CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall" -- DEBUG="yes" -- else -- DEFS="$DEFS -DNDEBUG" -- MAKEOPTS="-j1" -- DEBUG="no" -- fi - fi - - CXXFLAGS="$CXXFLAGS -I/usr/local/include" diff --git a/net-misc/stargazer/files/patches/stg-2.408-build.patch b/net-misc/stargazer/files/patches/stg-2.408-build.patch deleted file mode 100644 index 9d42a0487d88..000000000000 --- a/net-misc/stargazer/files/patches/stg-2.408-build.patch +++ /dev/null @@ -1,179 +0,0 @@ ---- a/projects/rlm_stg/configure.org 2013-01-18 18:06:17.000000000 +0200 -+++ b/projects/rlm_stg/configure 2013-01-18 18:07:18.000000000 +0200 -@@ -34,6 +34,7 @@ - then - OS=linux - release="" -+ ETC_DIR="./inst/linux/etc/stargazer" - MAKE="make" - fi - -@@ -48,6 +49,7 @@ - 9) OS=bsd7;; - *) OS=unknown;; - esac -+ ETC_DIR="./inst/freebsd/etc/stargazer" - MAKE="gmake" - fi - -@@ -163,5 +165,4 @@ - echo "DATA_MODE=$DATA_MODE" >> $CONFFILE - echo "DIR_MODE=$DIR_MODE" >> $CONFFILE - echo "OWNER=$OWNER" >> $CONFFILE --$MAKE $MAKEOPTS -- -+echo "ETC_DIR=$ETC_DIR" >> $CONFFILE -\ No newline at end of file ---- a/projects/rscriptd/configure.org 2013-01-18 18:07:28.000000000 +0200 -+++ b/projects/rscriptd/configure 2013-01-18 18:08:02.000000000 +0200 -@@ -34,6 +34,7 @@ - then - OS=linux - release="" -+ ETC_DIR="./inst/linux/etc/stargazer" - MAKE="make" - fi - -@@ -48,6 +49,7 @@ - 9) OS=bsd7;; - *) OS=unknown;; - esac -+ ETC_DIR="./inst/freebsd/etc/stargazer" - MAKE="gmake" - fi - -@@ -169,6 +171,4 @@ - echo "DATA_MODE=$DATA_MODE" >> $CONFFILE - echo "DIR_MODE=$DIR_MODE" >> $CONFFILE - echo "OWNER=$OWNER" >> $CONFFILE -- --$MAKE $MAKEOPTS -- -+echo "ETC_DIR=$ETC_DIR" >> $CONFFILE -\ No newline at end of file ---- a/projects/sgauth/configure.org 2013-01-18 18:08:10.000000000 +0200 -+++ b/projects/sgauth/configure 2013-01-18 18:08:38.000000000 +0200 -@@ -34,6 +34,7 @@ - then - OS=linux - release="" -+ ETC_DIR="./inst/linux/etc/stargazer" - MAKE="make" - fi - -@@ -48,6 +49,7 @@ - 9) OS=bsd7;; - *) OS=unknown;; - esac -+ ETC_DIR="./inst/freebsd/etc/stargazer" - MAKE="gmake" - fi - -@@ -167,5 +169,4 @@ - echo "DATA_MODE=$DATA_MODE" >> $CONFFILE - echo "DIR_MODE=$DIR_MODE" >> $CONFFILE - echo "OWNER=$OWNER" >> $CONFFILE --$MAKE $MAKEOPTS -- -+echo "ETC_DIR=$ETC_DIR" >> $CONFFILE -\ No newline at end of file ---- a/projects/sgconf/configure.org 2013-01-18 18:08:46.000000000 +0200 -+++ b/projects/sgconf/configure 2013-01-18 18:09:44.000000000 +0200 -@@ -34,6 +34,7 @@ - then - OS=linux - release="" -+ ETC_DIR="./inst/linux/etc/stargazer" - MAKE="make" - fi - -@@ -48,6 +49,7 @@ - 9) OS=bsd7;; - *) OS=unknown;; - esac -+ ETC_DIR="./inst/freebsd/etc/stargazer" - MAKE="gmake" - fi - -@@ -186,6 +188,4 @@ - echo "DATA_MODE=$DATA_MODE" >> $CONFFILE - echo "DIR_MODE=$DIR_MODE" >> $CONFFILE - echo "OWNER=$OWNER" >> $CONFFILE -- --$MAKE $MAKEOPTS -- -+echo "ETC_DIR=$ETC_DIR" >> $CONFFILE -\ No newline at end of file ---- a/projects/sgconf_xml/configure.org 2013-01-18 18:09:54.000000000 +0200 -+++ b/projects/sgconf_xml/configure 2013-01-18 18:10:23.000000000 +0200 -@@ -34,6 +34,7 @@ - then - OS=linux - release="" -+ ETC_DIR="./inst/linux/etc/stargazer" - MAKE="make" - fi - -@@ -48,6 +49,7 @@ - 9) OS=bsd7;; - *) OS=unknown;; - esac -+ ETC_DIR="./inst/freebsd/etc/stargazer" - MAKE="gmake" - fi - -@@ -186,6 +188,4 @@ - echo "DATA_MODE=$DATA_MODE" >> $CONFFILE - echo "DIR_MODE=$DIR_MODE" >> $CONFFILE - echo "OWNER=$OWNER" >> $CONFFILE -- --$MAKE $MAKEOPTS -- -+echo "ETC_DIR=$ETC_DIR" >> $CONFFILE -\ No newline at end of file ---- a/projects/sgconv/configure.org 2013-01-18 18:10:30.000000000 +0200 -+++ b/projects/sgconv/configure 2013-01-18 18:11:09.000000000 +0200 -@@ -35,6 +35,7 @@ - then - OS=linux - release="" -+ ETC_DIR="./inst/linux/etc/stargazer" - MAKE="make" - fi - -@@ -49,6 +50,7 @@ - 9) OS=bsd7;; - *) OS=unknown;; - esac -+ ETC_DIR="./inst/freebsd/etc/stargazer" - MAKE="gmake" - fi - -@@ -293,8 +295,6 @@ - echo "DIR_MODE=$DIR_MODE" >> $CONFFILE - echo "OWNER=$OWNER" >> $CONFFILE - echo "VAR_DIR=$VAR_DIR" >> $CONFFILE -+echo "ETC_DIR=$ETC_DIR" >> $CONFFILE - --mkdir -p ../stargazer/modules -- --$MAKE $MAKEOPTS -- -+mkdir -p ../stargazer/modules -\ No newline at end of file ---- a/projects/stargazer/configure.org 2013-01-18 18:11:15.000000000 +0200 -+++ b/projects/stargazer/configure 2013-01-18 18:11:40.000000000 +0200 -@@ -404,11 +404,4 @@ - echo "VAR_DIR=$VAR_DIR" >> $CONFFILE - echo "ETC_DIR=$ETC_DIR" >> $CONFFILE - --mkdir -p modules -- --if [ "$1" != "debug" ] --then -- $MAKE $MAKEOPTS --else -- echo -e "\n\n\nDebug build. Type $MAKE explicitly" --fi -+mkdir -p modules -\ No newline at end of file diff --git a/net-misc/stargazer/files/patches/stg-2.408-correct-paths.patch b/net-misc/stargazer/files/patches/stg-2.408-correct-paths.patch deleted file mode 100644 index 520d635d69c6..000000000000 --- a/net-misc/stargazer/files/patches/stg-2.408-correct-paths.patch +++ /dev/null @@ -1,186 +0,0 @@ ---- a/projects/rscriptd/rscriptd.conf.org 2013-01-08 18:19:34.000000000 +0200 -+++ b/projects/rscriptd/rscriptd.conf 2013-01-08 18:20:52.000000000 +0200 -@@ -6,7 +6,7 @@ - # Parameter: optional - # Value: file path - # Default: /var/log/rscriptd.log --LogFileName = /var/log/rscriptd.log -+LogFileName = /var/log/stargazer/rscriptd.log - - # Amount of rscriptd-exec processes. - # These processes are responsible for the execution of scripts -@@ -22,7 +22,7 @@ - # Parameter: optional - # Value: directory path - # Default: /etc/rscriptd --ConfigDir = /etc/rscriptd -+ConfigDir = /etc/stargazer - - # Defines password for the encryption exchange between - # Stargazer server and rscriptd. -@@ -49,12 +49,12 @@ - # Parameter: optional - # Value: file path - # Default: /etc/rscriptd/OnConnect --ScriptOnConnect = /etc/rscriptd/OnConnect -+ScriptOnConnect = /etc/stargazer/OnConnect - - # Defines file which runs when user loses access - # Parameter: optional - # Value: file path - # Default: /etc/rscriptd/OnDisconnect --ScriptOnDisconnect = /etc/rscriptd/OnDisconnect -+ScriptOnDisconnect = /etc/stargazer/OnDisconnect - - ################################################################################ -\ No newline at end of file ---- a/projects/sgconv/sgconv.conf.org 2012-12-18 21:56:33.578221904 +0200 -+++ b/projects/sgconv/sgconv.conf 2012-12-18 21:58:22.355217059 +0200 -@@ -18,27 +18,27 @@ - # Working server directory, provides data on tariffs, users, administrators. - # Parameter: required - # Value: directory path -- WorkDir = /var/stargazer -+ WorkDir = /var/lib/stargazer - - # Owner, group and permissions of the files of user statistics (stat) - # Parameter: required - # Values: any, supported by OS -- ConfOwner = root -- ConfGroup = root -+ ConfOwner = stg -+ ConfGroup = stg - ConfMode = 600 - - # Owner, group and permissions on user configuration files (conf) - # Parameter: required - # Values: any, supported by OS -- StatOwner = root -- StatGroup = root -+ StatOwner = stg -+ StatGroup = stg - StatMode = 640 - - # Owner, group and permissions for user log files (log) - # Parameter: required - # Values: any, supported by OS -- UserLogOwner = root -- UserLogGroup = root -+ UserLogOwner = stg -+ UserLogGroup = stg - UserLogMode = 640 - - </SourceStoreModule> -@@ -54,7 +54,7 @@ - # Parameter: required - # Value: file path - # Default: /var/stg/stargazer.fdb -- # database = /var/stg/stargazer.fdb -+ # database = /var/lib/stargazer/stargazer.fdb - - # Database username - # Parameter: required ---- a/projects/stargazer/inst/linux/etc/stargazer/stargazer.conf.org 2012-12-30 14:35:22.000000000 +0200 -+++ b/projects/stargazer/inst/linux/etc/stargazer/stargazer.conf 2012-12-30 14:36:37.000000000 +0200 -@@ -6,7 +6,7 @@ - # Parameter: required - # Value: file path - # Default: /var/log/stargazer.log --LogFile = /var/log/stargazer.log -+LogFile = /var/log/stargazer/stargazer.log - - # PID file name - # Parameter: optional -@@ -147,7 +147,7 @@ - # Parameter: optional - # Value: file path - # Default: /var/stargazer/monitor --#MonitorDir=/var/stargazer/monitor -+#MonitorDir=/var/lib/stargazer/monitor - - # Defines message maximum lifetime - # Note: 0 - unlimited ---- a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_remote_script.conf.org 2012-12-25 14:03:49.000000000 +0200 -+++ b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_remote_script.conf 2012-12-25 14:04:00.000000000 +0200 -@@ -16,7 +16,7 @@ - # Parametr: required - # Values: filename - # Default: subnets -- SubnetFile = subnets -+ SubnetFile = /etc/stargazer/subnets - - # The password to encrypt packets between the stg-server and remote server - # Parameter: required ---- a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_files.conf.org 2012-12-25 13:31:01.000000000 +0200 -+++ b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_files.conf 2012-12-25 13:31:43.000000000 +0200 -@@ -5,27 +5,27 @@ - # Working server directory, provides data on tariffs, users, administrators. - # Parameter: required - # Value: directory path -- WorkDir = /var/stargazer -+ WorkDir = /var/lib/stargazer - - # Owner, group and permissions of the files of user statistics (stat) - # Parameter: required - # Values: any, supported by OS -- ConfOwner = root -- ConfGroup = root -+ ConfOwner = stg -+ ConfGroup = stg - ConfMode = 640 - - # Owner, group and permissions on user configuration files (conf) - # Parameter: required - # Values: any, supported by OS -- StatOwner = root -- StatGroup = root -+ StatOwner = stg -+ StatGroup = stg - StatMode = 640 - - # Owner, group and permissions for user log files (log) - # Parameter: required - # Values: any, supported by OS -- UserLogOwner = root -- UserLogGroup = root -+ UserLogOwner = stg -+ UserLogGroup = stg - UserLogMode = 640 - - </StoreModule> ---- a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_firebird.conf.org 2012-12-25 13:39:00.000000000 +0200 -+++ b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_firebird.conf 2012-12-25 13:39:28.000000000 +0200 -@@ -9,7 +9,7 @@ - # Parameter: required - # Value: file path - # Default: /var/stg/stargazer.fdb -- Database = /var/stg/stargazer.fdb -+ Database = /var/lib/stargazer/stargazer.fdb - - # Database username - # Parameter: required ---- a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp.org 2012-12-31 11:08:26.000000000 +0200 -+++ b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp 2012-12-31 11:08:41.000000000 +0200 -@@ -169,7 +169,7 @@ - rpcServer = new xmlrpc_c::serverAbyss( - xmlrpc_c::serverAbyss::constrOpt() - .registryP(&rpcRegistry) -- .logFileName("/var/log/stargazer_rpc.log") -+ .logFileName("/var/log/stargazer/xmlrpc.log") - .socketFd(fd) - ); - ---- a/projects/stargazer/inst/var/00-base-00.sql.org 2013-01-02 16:22:28.000000000 +0200 -+++ b/projects/stargazer/inst/var/00-base-00.sql 2013-01-02 16:22:52.000000000 +0200 -@@ -50,9 +50,9 @@ - /* - * CONNECT 'localhost:/var/stg/stargazer.fdb' USER 'stg' PASSWORD '123456'; - * DROP DATABASE; -- * -- * CREATE DATABASE 'localhost:/var/stg/stargazer.fdb' USER 'stg' PASSWORD '123456' DEFAULT CHARACTER SET UTF8; - */ -+ CREATE DATABASE 'localhost:/var/lib/stargazer/stargazer.fdb' USER 'stg' PASSWORD '123456' DEFAULT CHARACTER SET UTF8; -+ - - - diff --git a/net-misc/stargazer/files/patches/stg-2.408-fix-crash-on-stop.patch b/net-misc/stargazer/files/patches/stg-2.408-fix-crash-on-stop.patch deleted file mode 100644 index 367c91209be7..000000000000 --- a/net-misc/stargazer/files/patches/stg-2.408-fix-crash-on-stop.patch +++ /dev/null @@ -1,190 +0,0 @@ -diff -Naur stg-2.408/projects/rscriptd/listener.cpp stg-2.408-patched/projects/rscriptd/listener.cpp ---- stg-2.408/projects/rscriptd/listener.cpp 2012-02-09 12:26:59.000000000 +0200 -+++ stg-2.408-patched/projects/rscriptd/listener.cpp 2013-02-11 09:04:32.000000000 +0200 -@@ -49,6 +49,8 @@ - receiverStopped(true), - processorStopped(true), - userTimeout(0), -+ receiverThread(0), -+ processorThread(0), - listenSocket(0) - { - version = "rscriptd listener v.1.2"; -@@ -149,8 +151,10 @@ - } - } - --pthread_join(receiverThread, NULL); --pthread_join(processorThread, NULL); -+if (receiverThread != 0) -+ pthread_join(receiverThread, NULL); -+if (processorThread != 0) -+ pthread_join(processorThread, NULL); - - pthread_mutex_destroy(&mutex); - -diff -Naur stg-2.408/projects/stargazer/eventloop.cpp stg-2.408-patched/projects/stargazer/eventloop.cpp ---- stg-2.408/projects/stargazer/eventloop.cpp 2012-02-09 12:27:06.000000000 +0200 -+++ stg-2.408-patched/projects/stargazer/eventloop.cpp 2013-02-11 09:03:11.000000000 +0200 -@@ -10,7 +10,7 @@ - : ACTIONS_LIST(), - _running(false), - _stopped(true), -- _tid(), -+ _tid(0), - _mutex(), - _condition() - { -@@ -41,7 +41,8 @@ - // Wake up thread - pthread_cond_signal(&_condition); - // Wait until thread exit --pthread_join(_tid, NULL); -+if (_tid != 0) -+ pthread_join(_tid, NULL); - return false; - } - -diff -Naur stg-2.408/projects/stargazer/plugins/capture/cap_nf/cap_nf.cpp stg-2.408-patched/projects/stargazer/plugins/capture/cap_nf/cap_nf.cpp ---- stg-2.408/projects/stargazer/plugins/capture/cap_nf/cap_nf.cpp 2012-02-09 12:27:14.000000000 +0200 -+++ stg-2.408-patched/projects/stargazer/plugins/capture/cap_nf/cap_nf.cpp 2013-02-11 09:01:34.000000000 +0200 -@@ -55,8 +55,8 @@ - NF_CAP::NF_CAP() - : traffCnt(NULL), - settings(), -- tidTCP(), -- tidUDP(), -+ tidTCP(0), -+ tidUDP(0), - runningTCP(false), - runningUDP(false), - stoppedTCP(true), -@@ -153,7 +153,8 @@ - } - if (stoppedUDP) - { -- pthread_join(tidUDP, NULL); -+ if (tidUDP != 0) -+ pthread_join(tidUDP, NULL); - } - else - { -@@ -176,7 +177,8 @@ - } - if (stoppedTCP) - { -- pthread_join(tidTCP, NULL); -+ if (tidTCP != 0) -+ pthread_join(tidTCP, NULL); - } - else - { -diff -Naur stg-2.408/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp stg-2.408-patched/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp ---- stg-2.408/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp 2012-02-09 12:27:15.000000000 +0200 -+++ stg-2.408-patched/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp 2013-02-11 09:02:05.000000000 +0200 -@@ -74,7 +74,7 @@ - //----------------------------------------------------------------------------- - ETHER_CAP::ETHER_CAP() - : errorStr(), -- thread(), -+ thread(0), - nonstop(false), - isRunning(false), - capSock(-1), -@@ -140,7 +140,8 @@ - } - else - { -- pthread_join(thread, NULL); -+ if (thread != 0) -+ pthread_join(thread, NULL); - } - } - -diff -Naur stg-2.408/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.cpp stg-2.408-patched/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.cpp ---- stg-2.408/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.cpp 2012-02-09 12:27:15.000000000 +0200 -+++ stg-2.408-patched/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.cpp 2013-02-11 09:02:37.000000000 +0200 -@@ -58,7 +58,7 @@ - IPQ_CAP::IPQ_CAP() - : ipq_h(NULL), - errorStr(), -- thread(), -+ thread(0), - nonstop(false), - isRunning(false), - capSock(-1), -@@ -120,7 +120,8 @@ - } - else - { -- pthread_join(thread, NULL); -+ if (thread != 0) -+ pthread_join(thread, NULL); - } - } - IPQCapClose(); -diff -Naur stg-2.408/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp stg-2.408-patched/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp ---- stg-2.408/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp 2012-02-09 12:27:16.000000000 +0200 -+++ stg-2.408-patched/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp 2013-02-11 09:00:33.000000000 +0200 -@@ -93,7 +93,7 @@ - rpcServer(NULL), - running(false), - stopped(true), -- tid(), -+ tid(0), - cookies(), - dayFee(0), - dirNames() -@@ -201,7 +201,8 @@ - } - else - { -- pthread_join(tid, NULL); -+ if (tid != 0) -+ pthread_join(tid, NULL); - } - - close(fd); -diff -Naur stg-2.408/projects/stargazer/plugins/other/smux/smux.cpp stg-2.408-patched/projects/stargazer/plugins/other/smux/smux.cpp ---- stg-2.408/projects/stargazer/plugins/other/smux/smux.cpp 2012-02-09 12:27:24.000000000 +0200 -+++ stg-2.408-patched/projects/stargazer/plugins/other/smux/smux.cpp 2013-02-11 09:07:54.000000000 +0200 -@@ -99,7 +99,7 @@ - errorStr(), - smuxSettings(), - settings(), -- thread(), -+ thread(0), - mutex(), - running(false), - stopped(true), -@@ -227,7 +227,7 @@ - } - } - --if (stopped) -+if (stopped && thread != 0) - pthread_join(thread, NULL); - - ResetNotifiers(); -diff -Naur stg-2.408/projects/stargazer/stg_timer.cpp stg-2.408-patched/projects/stargazer/stg_timer.cpp ---- stg-2.408/projects/stargazer/stg_timer.cpp 2012-02-09 12:27:30.000000000 +0200 -+++ stg-2.408-patched/projects/stargazer/stg_timer.cpp 2013-02-11 08:58:55.000000000 +0200 -@@ -7,7 +7,7 @@ - #include "stg/common.h" - - static int nonstop; --static pthread_t thrStgTimer; -+static pthread_t thrStgTimer(0); - static bool isTimerRunning = false; - volatile time_t stgTime; - -@@ -101,7 +101,8 @@ - void StopStgTimer() - { - nonstop = 0; --pthread_join(thrStgTimer, NULL); // Cleanup thread resources -+if (thrStgTimer != 0) -+ pthread_join(thrStgTimer, NULL); // Cleanup thread resources - printfd(__FILE__, "STG_TIMER stopped\n"); - } - //----------------------------------------------------------------------------- diff --git a/net-misc/stargazer/files/patches/stg-2.408-makefile-build-upstream.patch b/net-misc/stargazer/files/patches/stg-2.408-makefile-build-upstream.patch deleted file mode 100644 index 51d0f1f04ea6..000000000000 --- a/net-misc/stargazer/files/patches/stg-2.408-makefile-build-upstream.patch +++ /dev/null @@ -1,386 +0,0 @@ -diff --git a/projects/convertor/Makefile b/projects/convertor/Makefile -index efacbb6..04c00cc 100644 ---- a/projects/sgconv/Makefile -+++ b/projects/sgconv/Makefile -@@ -58,6 +58,21 @@ clean: - distclean: clean - rm -f ../../Makefile.conf - -+install: install-bin -+ -+install-bin: -+ifeq ($(DEBUG), yes) -+ install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG) -+else -+ install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG) -+endif -+ $(MAKE) -C $(DIR_PLUGINS) install -+ -+uninstall: uninstall-bin -+ -+uninstall-bin: -+ rm -f $(PREFIX)/usr/bin/$(PROG) -+ - ifneq ($(MAKECMDGOALS),distclean) - ifneq ($(MAKECMDGOALS),clean) - ifneq ($(MAKECMDGOALS),uninstall) -diff --git a/projects/convertor/build b/projects/convertor/build -index 0144b0f..471ee62 100755 ---- a/projects/sgconv/build -+++ b/projects/sgconv/build -@@ -20,6 +20,7 @@ DEFS="-DDEBUG" - MAKEOPTS="-j1" - CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -I/usr/local/include" - LDFLAGS="$LDFLAGS -L/usr/local/lib" -+DEBUG="yes" - - if [ "$sys" = "Linux" ] - then -@@ -251,6 +252,7 @@ fi - - echo "OS=$OS" > $CONFFILE - echo "STG_TIME=yes" >> $CONFFILE -+echo "DEBUG=$DEBUG" >> $CONFFILE - echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE - echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE - echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE -diff --git a/projects/rlm_stg/Makefile b/projects/rlm_stg/Makefile -index 98f5f2d..6190491 100644 ---- a/projects/rlm_stg/Makefile -+++ b/projects/rlm_stg/Makefile -@@ -57,13 +57,17 @@ distclean: clean - install: install-bin - - install-bin: -- install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/$(PROG) -+ifeq ($(DEBUG), yes) -+ install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG) -+else -+ install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG) -+endif - $(MAKE) -C $(DIR_LIBSRC) install - - uninstall: uninstall-bin - - uninstall-bin: -- rm -f $(PREFIX)/usr/lib/$(PROG) -+ rm -f $(PREFIX)/usr/lib/freeradius/$(PROG) - - ifneq ($(MAKECMDGOALS),distclean) - ifneq ($(MAKECMDGOALS),clean) -diff --git a/projects/rlm_stg/build b/projects/rlm_stg/build -index 0145d03..3781d1b 100755 ---- a/projects/rlm_stg/build -+++ b/projects/rlm_stg/build -@@ -19,14 +19,17 @@ OWNER=root - if [ -z $1 ] - then - MAKEOPTS="-j1" -+ DEBUG="no" - else - if [ "$1" = "debug" ] - then - DEFS="-DDEBUG" - MAKEOPTS="-j1" - CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall" -+ DEBUG="yes" - else - MAKEOPTS="-j1" -+ DEBUG="no" - fi - fi - -@@ -144,6 +147,7 @@ rm -f fake - - echo "OS=$OS" > $CONFFILE - echo "STG_TIME=yes" >> $CONFFILE -+echo "DEBUG=$DEBUG" >> $CONFFILE - echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE - echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE - echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE -diff --git a/projects/rscriptd/Makefile b/projects/rscriptd/Makefile -index 0912be0..da06b50 100644 ---- a/projects/rscriptd/Makefile -+++ b/projects/rscriptd/Makefile -@@ -57,7 +57,11 @@ distclean: clean - install: install-bin install-data - - install-bin: -- install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG) -+ifeq ($(DEBUG), yes) -+ install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG) -+else -+ install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG) -+endif - $(MAKE) -C $(DIR_LIBSRC) install - - install-data: -diff --git a/projects/rscriptd/build b/projects/rscriptd/build -index 885eef7..6a7c77f 100755 ---- a/projects/rscriptd/build -+++ b/projects/rscriptd/build -@@ -19,14 +19,17 @@ OWNER=root - if [ -z $1 ] - then - MAKEOPTS="-j1" -+ DEBUG="no" - else - if [ "$1" = "debug" ] - then - DEFS="-DDEBUG" - MAKEOPTS="-j1" - CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall" -+ DEBUG="yes" - else - MAKEOPTS="-j1" -+ DEBUG="no" - fi - fi - -@@ -150,6 +153,7 @@ rm -f build_check.c - - echo "OS=$OS" > $CONFFILE - echo "STG_TIME=yes" >> $CONFFILE -+echo "DEBUG=$DEBUG" >> $CONFFILE - echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE - echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE - echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE -diff --git a/projects/sgauth/Makefile b/projects/sgauth/Makefile -index 99cd0e4..a59371c 100644 ---- a/projects/sgauth/Makefile -+++ b/projects/sgauth/Makefile -@@ -58,7 +58,11 @@ distclean: clean - install: install-bin install-data - - install-bin: -- install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG) -+ifeq ($(DEBUG), yes) -+ install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG) -+else -+ install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG) -+endif - $(MAKE) -C $(DIR_LIBSRC) install - - install-data: -diff --git a/projects/sgauth/build b/projects/sgauth/build -index ec747e2..e3ad87f 100755 ---- a/projects/sgauth/build -+++ b/projects/sgauth/build -@@ -19,14 +19,17 @@ OWNER=root - if [ -z $1 ] - then - MAKEOPTS="-j1" -+ DEBUG="no" - else - if [ "$1" = "debug" ] - then - DEFS="-DDEBUG" - MAKEOPTS="-j1" - CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall" -+ DEBUG="yes" - else - MAKEOPTS="-j1" -+ DEBUG="no" - fi - fi - -@@ -148,6 +151,7 @@ rm -f build_check.c - - echo "OS=$OS" > $CONFFILE - echo "STG_TIME=yes" >> $CONFFILE -+echo "DEBUG=$DEBUG" >> $CONFFILE - echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE - echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE - echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE -diff --git a/projects/sgconf/Makefile b/projects/sgconf/Makefile -index 4d62bb5..297d3e2 100644 ---- a/projects/sgconf/Makefile -+++ b/projects/sgconf/Makefile -@@ -66,7 +66,11 @@ distclean: clean - install: install-bin - - install-bin: -- install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG) -+ifeq ($(DEBUG), yes) -+ install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG) -+else -+ install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG) -+endif - $(MAKE) -C $(DIR_LIBSRC) install - - uninstall: uninstall-bin -diff --git a/projects/sgconf/build b/projects/sgconf/build -index 1f6c0a0..da81773 100755 ---- a/projects/sgconf/build -+++ b/projects/sgconf/build -@@ -19,14 +19,17 @@ OWNER=root - if [ -z $1 ] - then - MAKEOPTS="-j1" -+ DEBUG="no" - else - if [ "$1" = "debug" ] - then - DEFS="-DDEBUG" - MAKEOPTS="-j1" - CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall" -+ DEBUG="yes" - else - MAKEOPTS="-j1" -+ DEBUG="no" - fi - fi - -@@ -166,6 +169,7 @@ fi - - echo "OS=$OS" > $CONFFILE - echo "STG_TIME=yes" >> $CONFFILE -+echo "DEBUG=$DEBUG" >> $CONFFILE - echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE - echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE - echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE -diff --git a/projects/sgconf_xml/Makefile b/projects/sgconf_xml/Makefile -index b7ebca0..32384e6 100644 ---- a/projects/sgconf_xml/Makefile -+++ b/projects/sgconf_xml/Makefile -@@ -66,7 +66,11 @@ distclean: clean - install: install-bin install-data - - install-bin: -- install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG) -+ifeq ($(DEBUG), yes) -+ install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG) -+else -+ install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG) -+endif - $(MAKE) -C $(DIR_LIBSRC) install - - uninstall: uninstall-bin uninstall-data -diff --git a/projects/sgconf_xml/build b/projects/sgconf_xml/build -index f78e6f7..9797075 100755 ---- a/projects/sgconf_xml/build -+++ b/projects/sgconf_xml/build -@@ -19,14 +19,17 @@ OWNER=root - if [ -z $1 ] - then - MAKEOPTS="-j1" -+ DEBUG="no" - else - if [ "$1" = "debug" ] - then - DEFS="-DDEBUG" - MAKEOPTS="-j1" - CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall" -+ DEBUG="yes" - else - MAKEOPTS="-j1" -+ DEBUG="no" - fi - fi - -@@ -166,6 +169,7 @@ fi - - echo "OS=$OS" > $CONFFILE - echo "STG_TIME=yes" >> $CONFFILE -+echo "DEBUG=$DEBUG" >> $CONFFILE - echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE - echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE - echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE -diff --git a/projects/stargazer/Makefile b/projects/stargazer/Makefile -index 44ae35e..9dfc0b5 100644 ---- a/projects/stargazer/Makefile -+++ b/projects/stargazer/Makefile -@@ -77,7 +77,11 @@ distclean: clean - install: install-bin install-data - - install-bin: $(PROG) -- install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG) -+ifeq ($(DEBUG), yes) -+ install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG) -+else -+ install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG) -+endif - $(MAKE) -C $(DIR_INCLUDE) install - $(MAKE) -C $(DIR_LIBSRC) install - $(MAKE) -C $(DIR_PLUGINS) install -diff --git a/projects/stargazer/build b/projects/stargazer/build -index c58b969..8a34c4f 100755 ---- a/projects/stargazer/build -+++ b/projects/stargazer/build -@@ -39,15 +39,18 @@ if [ -z "$1" ] - then - DEFS="$DEFS -DNDEBUG" - MAKEOPTS="-j1" -+ DEBUG="no" - else - if [ "$1" = "debug" ] - then - DEFS="$DEFS -DDEBUG" - MAKEOPTS="-j1" - CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall" -+ DEBUG="yes" - else - DEFS="$DEFS -DNDEBUG" - MAKEOPTS="-j1" -+ DEBUG="no" - fi - fi - -@@ -391,6 +394,7 @@ fi - - echo "OS=$OS" > $CONFFILE - echo "STG_TIME=yes" >> $CONFFILE -+echo "DEBUG=$DEBUG" >> $CONFFILE - echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE - echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE - echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE -diff --git a/projects/stargazer/plugins/Makefile.in b/projects/stargazer/plugins/Makefile.in -index 17e10ac..70954a2 100644 ---- a/projects/stargazer/plugins/Makefile.in -+++ b/projects/stargazer/plugins/Makefile.in -@@ -15,12 +15,12 @@ LIBS += $(addprefix -lstg,$(STGLIBS)) - - CXXFLAGS += -fPIC $(STGLIBS_INCS) - CFLAGS += -fPIC $(STGLIBS_INCS) --LDFLAGS += -shared -Wl,-rpath,$(PREFIX)/usr/lib/stg $(STGLIBS_LIBS) -+LDFLAGS += -shared -Wl,-rpath,$(PREFIX)/usr/lib/stg - - all: $(PROG) - - $(PROG): $(OBJS) -- $(CXX) $^ $(LDFLAGS) $(LIBS) -o $(PROG) -+ $(CXX) $^ $(STGLIBS_LIBS) $(LIBS) $(LDFLAGS) -o $(PROG) - $(LN) -fs "`pwd`/$(PROG)" $(DIR_MOD)/$(PROG) - - clean: -@@ -28,7 +28,11 @@ clean: - - install: $(PROG) - mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib/stg -- install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG) -+ifeq ($(DEBUG), yes) -+ install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/stg/$(PROG) -+else -+ install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG) -+endif - - uninstall: - rm -f $(PREFIX)/usr/lib/stg/$(PROG) -diff --git a/stglibs/Makefile.in b/stglibs/Makefile.in -index a318497..b5d1195 100644 ---- a/stglibs/Makefile.in -+++ b/stglibs/Makefile.in -@@ -35,8 +35,11 @@ clean: - rm -f deps $(PROG) *.o *.a *.so tags *.*~ - - install: $(PROG) -- mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib/stg -- install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG) -+ifeq ($(DEBUG), yes) -+ install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/stg/$(PROG) -+else -+ install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG) -+endif - mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/include/stg - install -m $(DATA_MODE) -o $(OWNER) $(addprefix include/stg/,$(INCS)) $(PREFIX)/usr/include/stg/ - diff --git a/net-misc/stargazer/files/patches/stg-2.408-makefile-firebird-upstream.patch b/net-misc/stargazer/files/patches/stg-2.408-makefile-firebird-upstream.patch deleted file mode 100644 index 166f12aff2a9..000000000000 --- a/net-misc/stargazer/files/patches/stg-2.408-makefile-firebird-upstream.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/projects/stargazer/plugins/store/firebird/Makefile.org 2013-01-04 22:50:13.000000000 +0200 -+++ b/projects/stargazer/plugins/store/firebird/Makefile 2013-01-04 22:50:56.000000000 +0200 -@@ -22,5 +22,11 @@ - locker \ - crypto - -+FB_CFLAGS = $(shell fb_config --cflags) -+FB_LDFLAGS = $(shell fb_config --libs) -+ -+CXXFLAGS += $(FB_CFLAGS) -+LDFLAGS += $(FB_LDFLAGS) -+ - include ../../Makefile.in diff --git a/net-misc/stargazer/files/patches/stg-2.408-makefile.patch b/net-misc/stargazer/files/patches/stg-2.408-makefile.patch deleted file mode 100644 index 6cb2a6c2dc50..000000000000 --- a/net-misc/stargazer/files/patches/stg-2.408-makefile.patch +++ /dev/null @@ -1,203 +0,0 @@ ---- a/projects/sgauth/Makefile.org 2013-01-05 23:47:38.000000000 +0200 -+++ b/projects/sgauth/Makefile 2013-01-05 23:48:34.000000000 +0200 -@@ -67,8 +67,8 @@ - - install-data: - # Install etc -- mkdir -m $(DIR_MODE) -p $(PREFIX)/etc -- install -m $(DATA_MODE) -o $(OWNER) ./sgauth.conf $(PREFIX)/etc/sgauth.conf -+ mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/stargazer -+ install -m $(DATA_MODE) -o $(OWNER) ./sgauth.conf $(PREFIX)/etc/stargazer/sgauth.conf - - uninstall: uninstall-bin uninstall-data - ---- a/projects/stargazer/Makefile.org 2013-01-05 22:53:26.000000000 +0200 -+++ b/projects/stargazer/Makefile 2013-01-05 22:54:52.000000000 +0200 -@@ -92,30 +92,8 @@ - mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/stargazer/conf-available.d - mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/stargazer/conf-enabled.d - install -m $(DATA_MODE) -o $(OWNER) $(ETC_DIR)/stargazer.conf $(PREFIX)/etc/stargazer/stargazer.conf -- install -m $(DATA_MODE) -o $(OWNER) $(ETC_DIR)/conf-available.d/*.conf $(PREFIX)/etc/stargazer/conf-available.d -- ln -sf ../conf-available.d/mod_ao.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_ao.conf -- ln -sf ../conf-available.d/mod_ia.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_ia.conf -- ln -sf ../conf-available.d/mod_ping.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_ping.conf -- ln -sf ../conf-available.d/mod_sg.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_sg.conf -- ln -sf ../conf-available.d/store_files.conf $(PREFIX)/etc/stargazer/conf-enabled.d/store_files.conf -- --ifeq ($(OS),linux) -- ln -sf ../conf-available.d/mod_cap_ether.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_cap_ether.conf --else -- ln -sf ../conf-available.d/mod_cap_bpf.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_cap_bpf.conf --endif -- - install -m $(DATA_MODE) -o $(OWNER) $(ETC_DIR)/rules $(PREFIX)/etc/stargazer/rules - install -m $(BIN_MODE) -o $(OWNER) $(ETC_DIR)/On* $(PREFIX)/etc/stargazer/ -- -- # Install file db -- mkdir -m $(DIR_MODE) -p $(PREFIX)/var/stargazer/admins -- mkdir -m $(DIR_MODE) -p $(PREFIX)/var/stargazer/tariffs -- mkdir -m $(DIR_MODE) -p $(PREFIX)/var/stargazer/users/test -- install -m $(DATA_MODE) -o $(OWNER) $(VAR_DIR)/admins/admin.adm $(PREFIX)/var/stargazer/admins/admin.adm -- install -m $(DATA_MODE) -o $(OWNER) $(VAR_DIR)/tariffs/tariff.tf $(PREFIX)/var/stargazer/tariffs/tariff.tf -- install -m $(DATA_MODE) -o $(OWNER) $(VAR_DIR)/users/test/conf $(PREFIX)/var/stargazer/users/test/conf -- install -m $(DATA_MODE) -o $(OWNER) $(VAR_DIR)/users/test/stat $(PREFIX)/var/stargazer/users/test/stat - - uninstall: uninstall-bin uninstall-data - ---- a/projects/rscriptd/Makefile.org 2013-01-19 17:03:42.000000000 +0200 -+++ b/projects/rscriptd/Makefile 2013-01-19 17:04:25.000000000 +0200 -@@ -65,15 +65,13 @@ - $(MAKE) -C $(DIR_LIBSRC) install - - install-data: -- # Install etc -- mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/rscriptd -- install -m $(DATA_MODE) -o $(OWNER) ./rscriptd.conf $(PREFIX)/etc/rscriptd/rscriptd.conf -+ install -D -m $(DATA_MODE) -o $(OWNER) ./rscriptd.conf $(PREFIX)/etc/stargazer/rscriptd.conf - ifeq ($(OS), linux) -- install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/linux/etc/stargazer/OnConnect $(PREFIX)/etc/rscriptd/ -- install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/linux/etc/stargazer/OnDisconnect $(PREFIX)/etc/rscriptd/ -+ install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/linux/etc/stargazer/OnConnect $(PREFIX)/etc/stargazer/ -+ install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/linux/etc/stargazer/OnDisconnect $(PREFIX)/etc/stargazer/ - else -- install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/freebsd/etc/stargazer/OnConnect $(PREFIX)/etc/rscriptd/ -- install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/freebsd/etc/stargazer/OnDisconnect $(PREFIX)/etc/rscriptd/ -+ install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/freebsd/etc/stargazer/OnConnect $(PREFIX)/etc/stargazer/ -+ install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/freebsd/etc/stargazer/OnDisconnect $(PREFIX)/etc/stargazer/ - endif - - uninstall: uninstall-bin uninstall-data ---- a/projects/rlm_stg/Makefile.org 2013-02-03 14:02:58.000000000 +0200 -+++ b/projects/rlm_stg/Makefile 2013-02-03 14:05:43.000000000 +0200 -@@ -56,19 +56,11 @@ - install: install-bin - - install-bin: --ifeq ($(DEBUG), yes) - ifeq ($(OS), linux) - install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG) - else - install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/$(PROG) - endif --else --ifeq ($(OS), linux) -- install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG) --else -- install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/$(PROG) --endif --endif - $(MAKE) -C $(DIR_LIBSRC) install - - uninstall: uninstall-bin ---- a/projects/rscriptd/Makefile.org 2013-02-03 14:17:01.000000000 +0200 -+++ b/projects/rscriptd/Makefile 2013-02-03 14:17:32.000000000 +0200 -@@ -57,11 +57,7 @@ - install: install-bin install-data - - install-bin: --ifeq ($(DEBUG), yes) - install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG) --else -- install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG) --endif - $(MAKE) -C $(DIR_LIBSRC) install - - install-data: ---- a/projects/sgauth/Makefile.org 2013-02-03 14:18:37.000000000 +0200 -+++ b/projects/sgauth/Makefile 2013-02-03 14:18:48.000000000 +0200 -@@ -58,11 +58,7 @@ - install: install-bin install-data - - install-bin: --ifeq ($(DEBUG), yes) - install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG) --else -- install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG) --endif - $(MAKE) -C $(DIR_LIBSRC) install - - install-data: ---- a/projects/sgconf/Makefile.org 2013-02-03 14:19:18.000000000 +0200 -+++ b/projects/sgconf/Makefile 2013-02-03 14:19:28.000000000 +0200 -@@ -66,11 +66,7 @@ - install: install-bin - - install-bin: --ifeq ($(DEBUG), yes) - install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG) --else -- install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG) --endif - $(MAKE) -C $(DIR_LIBSRC) install - - uninstall: uninstall-bin ---- a/projects/sgconf_xml/Makefile.org 2013-02-03 14:19:53.000000000 +0200 -+++ b/projects/sgconf_xml/Makefile 2013-02-03 14:19:59.000000000 +0200 -@@ -66,11 +66,7 @@ - install: install-bin install-data - - install-bin: --ifeq ($(DEBUG), yes) - install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG) --else -- install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG) --endif - $(MAKE) -C $(DIR_LIBSRC) install - - uninstall: uninstall-bin uninstall-data ---- a/projects/sgconv/Makefile.org 2013-02-03 14:20:24.000000000 +0200 -+++ b/projects/sgconv/Makefile 2013-02-03 14:20:33.000000000 +0200 -@@ -61,11 +61,7 @@ - install: install-bin - - install-bin: --ifeq ($(DEBUG), yes) - install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG) --else -- install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG) --endif - $(MAKE) -C $(DIR_PLUGINS) install - - uninstall: uninstall-bin ---- a/projects/stargazer/Makefile.org 2013-02-03 14:20:56.000000000 +0200 -+++ b/projects/stargazer/Makefile 2013-02-03 14:21:30.000000000 +0200 -@@ -77,11 +77,7 @@ - install: install-bin install-data - - install-bin: $(PROG) --ifeq ($(DEBUG), yes) - install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG) --else -- install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG) --endif - $(MAKE) -C $(DIR_INCLUDE) install - $(MAKE) -C $(DIR_LIBSRC) install - $(MAKE) -C $(DIR_PLUGINS) install ---- a/stglibs/Makefile.in.org 2013-02-03 14:53:02.000000000 +0200 -+++ b/stglibs/Makefile.in 2013-02-03 14:53:11.000000000 +0200 -@@ -35,11 +35,7 @@ - rm -f deps $(PROG) *.o *.a *.so tags *.*~ - - install: $(PROG) --ifeq ($(DEBUG), yes) - install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/stg/$(PROG) --else -- install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG) --endif - mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/include/stg - install -m $(DATA_MODE) -o $(OWNER) $(addprefix include/stg/,$(INCS)) $(PREFIX)/usr/include/stg/ - ---- a/projects/stargazer/plugins/Makefile.in.org 2013-02-03 15:38:41.000000000 +0200 -+++ b/projects/stargazer/plugins/Makefile.in 2013-02-03 15:38:51.000000000 +0200 -@@ -28,11 +28,7 @@ - - install: $(PROG) - mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib/stg --ifeq ($(DEBUG), yes) - install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/stg/$(PROG) --else -- install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG) --endif - - uninstall: - rm -f $(PREFIX)/usr/lib/stg/$(PROG) diff --git a/net-misc/stargazer/files/patches/stg-2.408-on-upstream.patch b/net-misc/stargazer/files/patches/stg-2.408-on-upstream.patch deleted file mode 100644 index 64a5964a8e0a..000000000000 --- a/net-misc/stargazer/files/patches/stg-2.408-on-upstream.patch +++ /dev/null @@ -1,151 +0,0 @@ ---- a/projects/stargazer/inst/linux/etc/stargazer/OnChange.org 2013-01-09 14:30:32.000000000 +0200 -+++ b/projects/stargazer/inst/linux/etc/stargazer/OnChange 2013-01-09 15:50:01.000000000 +0200 -@@ -1,8 +1,20 @@ - #! /bin/sh - --login=$1 --param=$2 --oldValue=$3 --newValue=$4 -+# About: This script is called when user account is changed. -+# Common Task: Notify about various events. -+# Priority: optional - --#echo "User: '$login'. Parameter $param changed from '$oldValue' to '$newValue'" >> /var/stargazer/users.chg.log -\ No newline at end of file -+# User login -+LOGIN=$1 -+ -+# User parameter -+PARAMETER=$2 -+ -+# User parameter old value -+OLDVALUE=$3 -+ -+# User parameter new value -+NEWVALUE=$4 -+ -+# Usage examples: -+#echo "User: '$LOGIN'. Parameter $PARAMETER changed from '$OLDVALUE' to '$NEWVALUE'" >> /var/stargazer/user.change.log -\ No newline at end of file ---- a/projects/stargazer/inst/linux/etc/stargazer/OnConnect.org 2013-01-09 14:39:51.000000000 +0200 -+++ b/projects/stargazer/inst/linux/etc/stargazer/OnConnect 2013-01-09 15:11:49.000000000 +0200 -@@ -1,24 +1,23 @@ - #! /bin/sh - --#Этот скрипт вызывается в момент, когда пользователь --#успешно прошел авторизацию на сервере. Задача скрипта - перестроить --#файрвол так, что бы пользователь получил доступ в интернет -+# About: This script is called when the user successfully authenticated on the server. -+# Common Task: Rebuild firewall to allow user to access the Internet. -+# Priority: required - --# Login -+# User login - LOGIN=$1 - --#user IP -+# User IP - IP=$2 - --#cash -+# User cash - CASH=$3 - --#user ID -+# User ID - ID=$4 - --#Selected dirs to connect -+# Selected DIRs (from rules file) to connect - DIRS=$5 - -- --#echo "C `date +%Y.%m.%d-%H.%M.%S` $IP $CASH" >> /var/stargazer/users/$LOGIN/connect.log -- -+# Usage examples: -+#echo "Connected `date +%Y.%m.%d-%H.%M.%S` $IP $CASH" >> /var/stargazer/users/$LOGIN/connect.log -\ No newline at end of file ---- a/projects/stargazer/inst/linux/etc/stargazer/OnDisconnect.org 2013-01-09 14:54:36.000000000 +0200 -+++ b/projects/stargazer/inst/linux/etc/stargazer/OnDisconnect 2013-01-09 15:11:33.000000000 +0200 -@@ -1,24 +1,23 @@ - #! /bin/sh - --# Этот скрипт вызывается в момент, когда пользователь --# желает отключится от интернета или вышел таймаут у пользователя --# и сервер сам отключает пользователя --# Задача скрипта подобна задаче скрипта OnConnect - перестроить --# файрвол так, что бы пользователю закрыть доступ в интернет -+# About: This script is called when the user wants to disconnect or authorization timeout has passed. -+# Common task: Rebuild firewall to disallow user to access to the Internet. -+# Priority: required - --# Login -+# User login - LOGIN=$1 - --#user IP -+# User IP - IP=$2 - --#cash -+# User cash - CASH=$3 - --#user ID -+# User ID - ID=$4 - --#Selected dirs to disconnect -+# Selected DIRs (from rules file) to disconnect - DIRS=$5 - --#echo "D `date +%Y.%m.%d-%H.%M.%S` $IP $CASH" >> /var/stargazer/users/$LOGIN/connect.log -+# Usage examples: -+#echo "Disconnected `date +%Y.%m.%d-%H.%M.%S` $IP $CASH" >> /var/stargazer/users/$LOGIN/connect.log -\ No newline at end of file ---- a/projects/stargazer/inst/linux/etc/stargazer/OnUserAdd.org 2013-01-09 15:01:57.000000000 +0200 -+++ b/projects/stargazer/inst/linux/etc/stargazer/OnUserAdd 2013-01-09 15:10:55.000000000 +0200 -@@ -1,14 +1,12 @@ - #! /bin/sh - --# Использование (неиспользование) этого скрипта дело вкуса. --# Он не выполняет критических функций. Его задача автматизировать --# действия характерные при добавлении пользователя сети, например добавлекние --# пользователю почты -- --# Login --login=$1 -- --#echo "added user $login" >> /var/stargazer/add_del.log -- -+# About: This script is called when the user is added to the Stargazer. -+# Common task: Automate typical actions on adding user to the network, -+# such as creating email or IM account. -+# Priority: optional - -+# User login -+LOGIN=$1 - -+# Usage examples: -+#echo "Added user $login" >> /var/stargazer/add_del.log -\ No newline at end of file ---- a/projects/stargazer/inst/linux/etc/stargazer/OnUserDel.org 2013-01-09 15:12:32.000000000 +0200 -+++ b/projects/stargazer/inst/linux/etc/stargazer/OnUserDel 2013-01-09 15:14:10.000000000 +0200 -@@ -1,7 +1,13 @@ - #! /bin/sh - --# Login --login=$1 -+# About: This script is called when the user is removed from the Stargazer. -+# Common task: Automate typical actions on removing user from the network, -+# such as removing email or IM account. -+# Priority: optional - --#echo "deleted user $login" >> /var/stargazer/add_del.log -+# User login -+LOGIN=$1 -+ -+# Usage examples: -+#echo "Deleted user $LOGIN" >> /var/stargazer/add_del.log - diff --git a/net-misc/stargazer/files/patches/stg-2.408-radius-upstream.patch b/net-misc/stargazer/files/patches/stg-2.408-radius-upstream.patch deleted file mode 100644 index 553b31999277..000000000000 --- a/net-misc/stargazer/files/patches/stg-2.408-radius-upstream.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/projects/rlm_stg/Makefile.org 2013-01-18 16:17:18.000000000 +0200 -+++ b/projects/rlm_stg/Makefile 2013-01-18 16:19:13.000000000 +0200 -@@ -57,16 +57,28 @@ - - install-bin: - ifeq ($(DEBUG), yes) -+ifeq ($(OS), linux) - install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG) - else -+ install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/$(PROG) -+endif -+else -+ifeq ($(OS), linux) - install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG) -+else -+ install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/$(PROG) -+endif - endif - $(MAKE) -C $(DIR_LIBSRC) install - - uninstall: uninstall-bin - - uninstall-bin: -+ifeq ($(OS), linux) - rm -f $(PREFIX)/usr/lib/freeradius/$(PROG) -+else -+ rm -f $(PREFIX)/usr/lib/$(PROG) -+endif - - ifneq ($(MAKECMDGOALS),distclean) - ifneq ($(MAKECMDGOALS),clean) diff --git a/net-misc/stargazer/files/patches/stg-2.408-rscriptd-upstream.patch b/net-misc/stargazer/files/patches/stg-2.408-rscriptd-upstream.patch deleted file mode 100644 index 708c1d900627..000000000000 --- a/net-misc/stargazer/files/patches/stg-2.408-rscriptd-upstream.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/projects/rscriptd/Makefile.org 2013-01-18 16:22:46.000000000 +0200 -+++ b/projects/rscriptd/Makefile 2013-01-18 16:25:08.000000000 +0200 -@@ -68,6 +68,13 @@ - # Install etc - mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/rscriptd - install -m $(DATA_MODE) -o $(OWNER) ./rscriptd.conf $(PREFIX)/etc/rscriptd/rscriptd.conf -+ifeq ($(OS), linux) -+ install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/linux/etc/stargazer/OnConnect $(PREFIX)/etc/rscriptd/ -+ install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/linux/etc/stargazer/OnDisconnect $(PREFIX)/etc/rscriptd/ -+else -+ install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/freebsd/etc/stargazer/OnConnect $(PREFIX)/etc/rscriptd/ -+ install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/freebsd/etc/stargazer/OnDisconnect $(PREFIX)/etc/rscriptd/ -+endif - - uninstall: uninstall-bin uninstall-data - -@@ -77,7 +84,8 @@ - uninstall-data: - # Uninstall etc - rm -f $(PREFIX)/etc/rscriptd/rscriptd.conf -- -+ rm -f $(PREFIX)/etc/rscriptd/OnConnect -+ rm -f $(PREFIX)/etc/rscriptd/OnDisconnect - - ifneq ($(MAKECMDGOALS),distclean) - ifneq ($(MAKECMDGOALS),clean) diff --git a/net-misc/stargazer/files/patches/stg-2.408-rscriptd.conf-upstream.patch b/net-misc/stargazer/files/patches/stg-2.408-rscriptd.conf-upstream.patch deleted file mode 100644 index 6b606353e224..000000000000 --- a/net-misc/stargazer/files/patches/stg-2.408-rscriptd.conf-upstream.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- a/projects/rscriptd/rscriptd.conf.org 2013-01-12 15:44:46.000000000 +0200 -+++ b/projects/rscriptd/rscriptd.conf 2013-01-12 15:45:44.000000000 +0200 -@@ -1,8 +1,68 @@ --LogFileName=/var/log/rscriptd.log --ExecutersNum=1 --ConfigDir=/etc/rscriptd --Password=123456 --Port=9999 --UserTimeout=60 --ScriptOnConnect=/etc/stargazer/OnConnect --ScriptOnDisconnect=/etc/stargazer/OnDisconnect -+################################################################################ -+# Rscriptd Configuration file # -+################################################################################ -+ -+# LOG file name -+# Parameter: optional -+# Value: file path -+# Default: /var/log/rscriptd.log -+LogFileName = /var/log/rscriptd.log -+ -+# Amount of rscriptd-exec processes. -+# These processes are responsible for the execution of scripts -+# OnConnect and OnDisconnect. -+# Amount of processes means how many scripts can be executed simultaneously. -+# Recommend to leave 1 to avoid errors when executing scripts -+# Parameter: optional -+# Value: 1 ... 1024 -+# Default: 1 -+ExecutersNum = 1 -+ -+# Message queue identifier for the script executer. -+# It may be changed if there're a needs to run multiple copies of rscriptd. -+# Warning: If you do not understand it, do not touch this setting! -+# Parameter: optional -+# Value: 0 ... 2 ^ 32 -+# Default: 5555 -+# ExecMsgKey = 5555 -+ -+# The path to directory where config files are -+# Parameter: optional -+# Value: directory path -+# Default: /etc/rscriptd -+ConfigDir = /etc/rscriptd -+ -+# Defines password for the encryption exchange between -+# Stargazer server and rscriptd. -+# Parameter: optional -+# Value: any -+# Default: 123456 -+Password = 123456 -+ -+# Defines port number for communication between -+# Stargazer server and rscriptd. -+# Parameter: optional -+# Value: 1 ... 65535 -+# Default: 9999 -+Port = 9999 -+ -+# User timeout. If Stargazer does not respond during this time, -+# the user will be disconnected. -+# Parameter: optional -+# Values: 5 ... 600 -+# Default: 60 -+UserTimeout = 60 -+ -+# Defines file which runs when user gets access -+# Parameter: optional -+# Value: file path -+# Default: /etc/rscriptd/OnConnect -+ScriptOnConnect = /etc/rscriptd/OnConnect -+ -+# Defines file which runs when user loses access -+# Parameter: optional -+# Value: file path -+# Default: /etc/rscriptd/OnDisconnect -+ScriptOnDisconnect = /etc/rscriptd/OnDisconnect -+ -+################################################################################ -\ No newline at end of file diff --git a/net-misc/stargazer/files/patches/stg-2.408-sgauth.conf-upstream.patch b/net-misc/stargazer/files/patches/stg-2.408-sgauth.conf-upstream.patch deleted file mode 100644 index d18c041cbdc3..000000000000 --- a/net-misc/stargazer/files/patches/stg-2.408-sgauth.conf-upstream.patch +++ /dev/null @@ -1,112 +0,0 @@ ---- a/projects/sgauth/sgauth.conf.org 2013-01-08 15:43:09.000000000 +0200 -+++ b/projects/sgauth/sgauth.conf 2013-01-09 13:41:53.000000000 +0200 -@@ -1,37 +1,72 @@ --#Stargazer server ip --ServerName=192.168.1.2 -+################################################################################ -+# Sgauth Configuration file # -+################################################################################ -+ -+# Stargazer server -+# Parameter: required -+# Values: IP address or DNS name -+# Default: -+ServerName = 192.168.1.2 -+ -+# Port on which Stargazer interacts with sgauth -+# Parameter: optional -+# Value: 1 ... 65535 -+# Default: 5555 -+ServerPort = 5555 -+ -+# User's login in Stargazer -+# Parameter: required -+# Value: any -+# Default: -+Login = test -+ -+# Port on which sgauth interacts with Stargazer -+# Parameter: optional -+# Value: 1 ... 65535 -+# Default: 0 -+LocalPort = 12345 -+ -+# User's password in Stargazer -+# Parameter: required -+# Value: any -+# Default: -+Password = 123456 -+ -+# Defines should sgauth try to reestablish connection to Stargazer -+# if it was lost -+# Parameter: optional -+# Value: yes, no -+# Default: yes -+Reconnect = yes -+ -+# Defines should sgauth run as daemon -+# Parameter: optional -+# Value: yes, no -+# Default: yes -+Daemon = yes -+ -+# Web-page refresh period in built-in webserver -+# Parameter: optional -+# Value: any numeric (minutes) -+# Default: 10 -+RefreshPeriod = 10 -+ -+# Defines should sgauth use built-in webserver -+# Parameter: optional -+# Value: yes, no -+# Default: no -+DisableWeb = no -+ -+# Defines address on which sgauth's built-in webserver will listen -+# Parameter: optional -+# Value: IP address or DNS name -+# Default: 127.0.0.1 -+ListenWebIP = 127.0.0.1 -+ -+# Defines should sgauth show it process ID in process list -+# Parameter: optional -+# Value: yes, no -+# Default: no -+ShowPid = no - --#Stargazer server port --#Default value 5555 --ServerPort=5555 -- --#User's login --Login=test -- --# --# --LocalPort=12345 -- --#User's password --Password=1234567 -- --# --#Default value yes --#Reconnect=no -- --# --#Default value yes --#Daemon=yes -- --#Refresh web page period --#Default value 10 --#RefreshPeriod=10 -- --# --#Default value 127.0.0.1 --ListenWebIP=127.0.0.1 -- --#Default value no --DisableWeb=no -- --#ShowPid=no -+################################################################################ -\ No newline at end of file diff --git a/net-misc/stargazer/files/patches/stg-2.408-sgconv-upstream.patch b/net-misc/stargazer/files/patches/stg-2.408-sgconv-upstream.patch deleted file mode 100644 index f1cdf5c5e83a..000000000000 --- a/net-misc/stargazer/files/patches/stg-2.408-sgconv-upstream.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/projects/sgconv/Makefile.org 2013-01-08 12:07:06.000000000 +0200 -+++ b/projects/sgconv/Makefile 2013-01-08 12:07:11.000000000 +0200 -@@ -4,7 +4,7 @@ - - include ../../Makefile.conf - --PROG = convertor -+PROG = sgconv - - SRCS = ./main.cpp \ - ./settings_impl.cpp ---- a/projects/sgconv/build.org 2012-02-09 12:26:57.000000000 +0200 -+++ b/projects/sgconv/build 2013-01-08 12:10:02.000000000 +0200 -@@ -45,13 +45,13 @@ - if [ "$OS" = "unknown" ] - then - echo "#############################################################################" -- echo "# Sorry, but convertor currently supported by Linux, FreeBSD 4.x, 5.x, 6.x #" -+ echo "# Sorry, but sgconv currently supported by Linux, FreeBSD 4.x, 5.x, 6.x #" - echo "#############################################################################" - exit 1 - fi - - echo "#############################################################################" --echo " Building convertor for $sys $release" -+echo " Building sgconv for $sys $release" - echo "#############################################################################" - - STG_LIBS="logger.lib ---- a/projects/sgconv/settings_impl.h.org 2013-01-08 12:11:53.000000000 +0200 -+++ b/projects/sgconv/settings_impl.h 2013-01-08 12:11:58.000000000 +0200 -@@ -38,7 +38,7 @@ - - class SETTINGS_IMPL { - public: -- SETTINGS_IMPL() : confFile("./convertor.conf") {} -+ SETTINGS_IMPL() : confFile("./sgconv.conf") {} - SETTINGS_IMPL(const std::string & cf) : confFile(cf) {} - ~SETTINGS_IMPL() {} - int ReadSettings(); diff --git a/net-misc/stargazer/files/patches/stg-2.408-static-libs.patch b/net-misc/stargazer/files/patches/stg-2.408-static-libs.patch deleted file mode 100644 index 68f16d41647d..000000000000 --- a/net-misc/stargazer/files/patches/stg-2.408-static-libs.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/stglibs/Makefile.org 2013-01-19 18:21:57.000000000 +0200 -+++ b/stglibs/Makefile 2013-01-19 18:24:25.000000000 +0200 -@@ -15,6 +15,6 @@ - - clean: all - --install: all -+install: - - uninstall: all diff --git a/net-misc/stargazer/files/rscriptd b/net-misc/stargazer/files/rscriptd deleted file mode 100644 index d8ddf44f696e..000000000000 --- a/net-misc/stargazer/files/rscriptd +++ /dev/null @@ -1,23 +0,0 @@ -#!/sbin/openrc-run - -DAEMON=/usr/sbin/rscriptd -RSCRIPTD_OPTS="/etc/stargazer/rscriptd.conf" -PIDFILE="/run/rscriptd.pid" - -depend() { - need net - provide rscriptd -} - -start() { - ebegin "Starting rscriptd" - start-stop-daemon --start --quiet --background --make-pidfile --pidfile ${PIDFILE} --exec ${DAEMON} -- ${RSCRIPTD_OPTS} - eend $? -} - -stop() { - ebegin "Stopping rscriptd" - start-stop-daemon --stop --quiet --pidfile ${PIDFILE} - rm -f ${PIDFILE} - eend $? -}
\ No newline at end of file diff --git a/net-misc/stargazer/files/sgauth b/net-misc/stargazer/files/sgauth deleted file mode 100644 index 0dec60bfa1af..000000000000 --- a/net-misc/stargazer/files/sgauth +++ /dev/null @@ -1,27 +0,0 @@ -#!/sbin/openrc-run - -DAEMON=/usr/sbin/sgauth -SGAUTH_OPTS="/etc/stargazer/sgauth.conf" -PIDFILE="/run/sgauth.pid" - -depend() { - need net - provide sgauth -} - -start() { - ebegin "Starting sgauth" - start-stop-daemon --start --quiet --pidfile ${PIDFILE} --exec ${DAEMON} -- ${SGAUTH_OPTS} - eend $? -} - -start_post() { - pgrep -n $RC_SVCNAME > ${PIDFILE} -} - -stop() { - ebegin "Stopping sgauth" - start-stop-daemon --stop --quiet --pidfile ${PIDFILE} - rm -f ${PIDFILE} - eend $? -}
\ No newline at end of file diff --git a/net-misc/stargazer/metadata.xml b/net-misc/stargazer/metadata.xml deleted file mode 100644 index 1f91c8885843..000000000000 --- a/net-misc/stargazer/metadata.xml +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>spiderx@spiderx.dp.ua</email> - <name>Vladimir Pavljuchenkov</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <longdescription lang="en"> - Stargazer is a powerful (inter)net billing system, capable of gathering - traffic statistics from many sources (such as NetFlow protocol, - ethernet packets capture, or IPQ subsystem), managing and billing user - accounts according to specified fees and rules (including time-based rules, - traffic source/destination rules and a payoff system). - This ebuild allows you to compile it yourself depending of your needs. - </longdescription> - <use> - <flag name="sgconv">Enable build of utility to convert Stargazer data between storage backends.</flag> - <flag name="radius">Enable build of FreeRADIUS module for data access via Stargazer.</flag> - <flag name="rscriptd">Enable build of remote script execute daemon for Stargazer, which run scripts when receive special signal from Stargazer.</flag> - <flag name="sgauth">Enable build of command-line utility for authorization in Stargazer.</flag> - <flag name="sgconf">Enable build of command-line utility for configuring Stargazer.</flag> - <flag name="sgconf_xml">Enable build of command-line xml-based utility for configuring Stargazer.</flag> - <flag name="stargazer">Enable build of Stargazer billing system.</flag> - <flag name="debug">Enable extra debug codepaths, like asserts and extra output.</flag> - <flag name="module_auth_always_online">Enable build of "Always Online" authentication module for Stargazer.</flag> - <flag name="module_auth_internet_access">Enable build of "InetAccess" authentication module for Stargazer. InetAccess is a Stargazer specific authentication protocol.</flag> - <flag name="module_auth_freeradius">Enable build of "Radius" authentication module for Stargazer. This module capable of using RADIUS procotol for user authentication.</flag> - <flag name="module_capture_ether">Enable build of "Ethernet" traffic capture module for Stargazer. This module uses RAW sockets to capture traffic.</flag> - <flag name="module_capture_ipq">Enable build of "IPQ" traffic capture module for Stargazer. This module uses IPQ subsystem to capture traffic.</flag> - <flag name="module_capture_netflow">Enable build of "NetFlow" traffic capture module for Stargazer. This module capable of receiving traffic data by NetFlow protocol.</flag> - <flag name="module_config_rpcconfig">Enable build of "XMLRPC" configuration module for Stargazer. This module uses XML-RPC protocol for configuring Stargazer.</flag> - <flag name="module_config_sgconfig">Enable build of "SGConf" configuration module for Stargazer. This module uses Stargazer specific protocol for configuring Stargazer.</flag> - <flag name="module_other_ping">Enable build of "Ping" module for Stargazer. This module pings connected users from time to time to ensure they are alive.</flag> - <flag name="module_other_remote_script">Enable build of "Remote Script" module for Stargazer. This module control rscriptd daemon over the net and makes it execute scripts in reaction to different Stargazer events.</flag> - <flag name="module_other_smux">Enable build of SMUX module for Stargazer. This module uses SMUX protocol to provide various information about Stargazer.</flag> - <flag name="module_store_files">Enable build of storage plugin for Stargazer based on plain files.</flag> - <flag name="module_store_firebird">Enable build of storage plugin for Stargazer, which uses Firebird database for storage.</flag> - <flag name="module_store_mysql">Enable build of storage plugin for Stargazer, which uses MySQL for storage.</flag> - <flag name="module_store_postgres">Enable build of storage plugin for Stargazer, which uses PostgreSQL for storage.</flag> - </use> - <upstream> - <doc>http://stg.net.ua/doc/index.html</doc> - <bugs-to>mailto:faust@stg.dp.ua</bugs-to> - <remote-id type="github">madf/stg</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-misc/stargazer/stargazer-2.408-r2.ebuild b/net-misc/stargazer/stargazer-2.408-r2.ebuild deleted file mode 100644 index 7f3667a702eb..000000000000 --- a/net-misc/stargazer/stargazer-2.408-r2.ebuild +++ /dev/null @@ -1,542 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PROJECTS="sgconv rlm_stg rscriptd sgauth sgconf sgconf_xml stargazer" - -STG_MODULES_AUTH="always_online internet_access freeradius" -STG_MODULES_CAPTURE="ipq ether netflow" -STG_MODULES_CONFIG="sgconfig rpcconfig" -STG_MODULES_OTHER="ping smux remote_script" -STG_MODULES_STORE="files firebird mysql postgres" - -declare -A MODULES -MODULES=( [module_auth_always_online]="authorization\/ao:mod_ao" - [module_auth_internet_access]="authorization\/inetaccess:mod_ia" - [module_auth_freeradius]="other\/radius:mod_radius" - [module_capture_ipq]="capture\/ipq_linux:mod_cap_ipq" - [module_capture_ether]="capture\/ether_linux:mod_cap_ether" - [module_capture_netflow]="capture\/cap_nf:mod_cap_nf" - [module_config_sgconfig]="configuration\/sgconfig:mod_sg" - [module_config_rpcconfig]="configuration\/rpcconfig:mod_rpc" - [module_other_ping]="other\/ping:mod_ping" - [module_other_smux]="other\/smux:mod_smux" - [module_other_remote_script]="other\/rscript:mod_remote_script" - [module_store_files]="store\/files:store_files" - [module_store_firebird]="store\/firebird:store_firebird" - [module_store_mysql]="store\/mysql:store_mysql" - [module_store_postgres]="store\/postgresql:store_postgresql" -) - -declare -A INIT -INIT=( [module_store_files]="11d" - [module_store_firebird]="11d;s/need net/need net firebird/" - [module_store_mysql]="11d;s/need net/need net mysql/" - [module_store_postgres]="11d;s/need net/need net postgresql/" -) - -MY_P="stg-${PV}" - -inherit flag-o-matic linux-info - -DESCRIPTION="Billing system for small home and office networks" -HOMEPAGE="http://stg.dp.ua/" -SRC_URI="http://stg.dp.ua/download/server/${PV}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -CDEPEND=" - acct-group/stg - acct-user/stg -" - -RDEPEND=" - module_config_rpcconfig? ( - dev-libs/expat - dev-libs/xmlrpc-c[abyss,cxx] - ) - module_config_sgconfig? ( dev-libs/expat ) - module_store_firebird? ( dev-db/firebird ) - module_store_mysql? ( dev-db/mysql-connector-c:0= ) - module_store_postgres? ( dev-db/postgresql:= ) - rscriptd? ( ${CDEPEND} ) - sgauth? ( ${CDEPEND} ) - sgconf? ( - ${CDEPEND} - dev-libs/expat - ) - sgconf_xml? ( dev-libs/expat ) - stargazer? ( ${CDEPEND} ) -" - -DEPEND="${RDEPEND}" - -REQUIRED_USE="stargazer? ( ^^ ( module_store_files module_store_firebird module_store_mysql module_store_postgres ) )" - -DOCS=( BUGS ../../ChangeLog CHANGES README TODO ) - -# Patches already in upstream's trunk -PATCHES=( - # Fix dependency on fbclient for module_store_firebird - "${FILESDIR}"/patches/stg-2.408-makefile-firebird-upstream.patch - # Rewrite config for rscriptd - "${FILESDIR}"/patches/stg-2.408-rscriptd.conf-upstream.patch - # Rewrite config for sgauth - "${FILESDIR}"/patches/stg-2.408-sgauth.conf-upstream.patch - # Standardization of 'On-scripts' - "${FILESDIR}"/patches/stg-2.408-on-upstream.patch - # Install demo scripts for rscriptd - "${FILESDIR}"/patches/stg-2.408-rscriptd-upstream.patch - # Fix crush on stop - "${FILESDIR}"/patches/stg-2.408-fix-crash-on-stop.patch - # Rename convertor to sgconv to avoid possible file name collisions - "${FILESDIR}"/patches/stg-2.408-sgconv-upstream.patch - # Debug support. Install radius lib to /usr/lib/freeradius - "${FILESDIR}"/patches/stg-2.408-makefile-build-upstream.patch - # Don't compile sgconv always with debug. Remove MAKEOPTS=-j1 - "${FILESDIR}"/patches/stg-2.408-build-upstream.patch - # FreeBSD install directory - "${FILESDIR}"/patches/stg-2.408-radius-upstream.patch -) - -IUSE="sgconv radius rscriptd sgauth sgconf sgconf_xml stargazer debug" - -for module in ${STG_MODULES_AUTH} ; do IUSE="${IUSE} module_auth_${module}" ; done -for module in ${STG_MODULES_CAPTURE} ; do IUSE="${IUSE} module_capture_${module}" ; done -for module in ${STG_MODULES_CONFIG} ; do IUSE="${IUSE} module_config_${module}" ; done -for module in ${STG_MODULES_OTHER} ; do IUSE="${IUSE} module_other_${module}" ; done -for module in ${STG_MODULES_STORE} ; do IUSE="${IUSE} module_store_${module}" ; done - -IUSE=${IUSE/stargazer/+stargazer} -IUSE=${IUSE/module_store_files/+module_store_files} - -src_prepare() { - # Rename convertor to sgconv to avoid possible file name collisions - mv projects/convertor/ projects/sgconv/ \ - || die "Couldn't move convertor folder" - mv projects/sgconv/convertor.conf \ - projects/sgconv/sgconv.conf || die "Couldn't move convertor config" - - default - - local project - for project in ${PROJECTS} ; do - # Rename build script to configure for further econf launch in every project - mv projects/$project/build projects/$project/configure \ - || die "Couldn't move build folder for $project" - # Change check for debug build - sed -i 's/if \[ "$1" = "debug" \]/if \[ "${10}" = "--enable-debug" \]/' \ - projects/$project/configure \ - || die "sed for debug check failed" - done - - # Correct working directory, user and group for sgconv.conf, store_files.conf - # Correct paths for rscriptd.conf, store_firebird.conf, mod_remote_scriptd.conf, stargazer.conf, rpcconfig.cpp, 00-base-00.sql - eapply "${FILESDIR}"/patches/stg-2.408-correct-paths.patch - - # Correct target install-data for stargazer, rscriptd, sgauth, remove debug symbols stripping - eapply "${FILESDIR}"/patches/stg-2.408-makefile.patch - - # Remove make from script (for keeping symbols), always add variable to Makefile.conf for all projects - eapply "${FILESDIR}"/patches/stg-2.408-build.patch - - # Remove static-libs - eapply "${FILESDIR}"/patches/stg-2.408-static-libs.patch - - # Define which module to compile - local module - for module in ${!MODULES[@]} ; do - if ! use $module ; then - sed -i "s/${MODULES[$module]%:*}//" \ - projects/stargazer/configure \ - || die "sed for module configure failed" - fi - done - - # Correct Gentoo init script - sed -i -e 's/opts/extra_commands/' \ - -e 's/runscript/openrc-run/' \ - projects/stargazer/inst/linux/etc/init.d/stargazer.gentoo \ - || die "sed for init-script failed" - local init - for init in ${!INIT[@]} ; do - if use $init ; then - sed -i "${INIT[$init]}" \ - projects/stargazer/inst/linux/etc/init.d/stargazer.gentoo \ - || die "sed for $init failed" - fi - done - - # Check for IPQ subsystem availability - if use module_capture_ipq && kernel_is ge 3 5 ; then - die "The IPQ subsystem requires kernel 3.5 or greater." - fi -} - -src_configure() { - use debug && filter-flags '-O?' - - # Define local variables, strip '+' symbol for used by default USE flags - local USEFLAGS=(${IUSE//+}) - local PROJECTS=($PROJECTS) - local i - - for (( i = 0 ; i < ${#PROJECTS[@]} ; i++ )) ; do - if use ${USEFLAGS[$i]} ; then - cd "${S}"/projects/${PROJECTS[$i]} \ - || die "cd to ${PROJECTS[$i]} failed" - econf $(use_enable debug) - fi - done -} - -src_compile() { - # Define local variables, strip '+' symbol for used by default USE flags - local USEFLAGS=(${IUSE//+}) - local PROJECTS=($PROJECTS) - local i - - # Set jobs to 1 for debug build - use debug && MAKEOPTS="-j1" - - # Build necessary libraries first - touch Makefile.conf - cd stglibs || die "cd to stglibs failed" - emake STG_LIBS="ia.lib srvconf.lib" - - for (( i = 0 ; i < ${#PROJECTS[@]} ; i++ )) ; do - if use ${USEFLAGS[$i]} ; then - cd "${S}"/projects/${PROJECTS[$i]} \ - || die "cd to ${PROJECTS[$i]} failed" - emake - fi - done -} - -src_install() { - if use rscriptd || use stargazer ; then - # Install config file for logrotate - insinto /etc/logrotate.d - newins "${FILESDIR}"/logrotate stargazer - - # Keeping logs directory - diropts -m 755 -o stg -g stg - keepdir /var/log/stargazer - if use stargazer ; then - diropts -m 775 -o stg -g stg - keepdir /var/lib/stargazer - fi - fi - - if use sgconv ; then - cd projects/sgconv || die "cd to sgconv failed" - - emake DESTDIR="${D}" PREFIX="${D}" install - - # Install files into specified directory - insinto /etc/stargazer - doins "${S}"/projects/sgconv/sgconv.conf - - # Install manual page - doman "${FILESDIR}"/mans/sgconv.1 - fi - - if use radius ; then - cd "${S}"/projects/rlm_stg || die "cd to rlm_stg failed" - - emake DESTDIR="${D}" PREFIX="${D}" install - fi - - if use rscriptd ; then - cd "${S}"/projects/rscriptd || die "cd to rscriptd failed" - - emake DESTDIR="${D}" PREFIX="${D}" install - - # Install Gentoo init script - doinitd "${FILESDIR}"/rscriptd - - # Correct permissions for file - fperms 0640 /etc/stargazer/rscriptd.conf - - # Install manual page - doman "${FILESDIR}"/mans/rscriptd.8 - fi - - if use sgauth ; then - cd "${S}"/projects/sgauth || die "cd to sgauth failed" - - emake DESTDIR="${D}" PREFIX="${D}" install - - # Correct permissions for file - fperms 0640 /etc/stargazer/sgauth.conf - - # Install manual page - doman "${FILESDIR}"/mans/sgauth.8 - fi - - if use sgconf ; then - cd "${S}"/projects/sgconf || die "cd to sgconf failed" - - emake DESTDIR="${D}" PREFIX="${D}" install - - # Install manual page - doman "${FILESDIR}"/mans/sgconf.1 - fi - - if use sgconf_xml ; then - cd "${S}"/projects/sgconf_xml || die "cd to sgconf_xml failed" - - emake DESTDIR="${D}" PREFIX="${D}" install - - # Install manual page - doman "${FILESDIR}"/mans/sgconf_xml.1 - fi - - if use stargazer ; then - cd "${S}"/projects/stargazer || die "cd to stargazer failed" - - emake DESTDIR="${D}" PREFIX="${D}" install - - # Install docs - einstalldocs - - # Install and rename Gentoo init script - newinitd "${S}"/projects/stargazer/inst/linux/etc/init.d/stargazer.gentoo stargazer - - # Install manual page - doman "${FILESDIR}"/mans/stargazer.8 - - # Install files needed for module_store_files - if use module_store_files ; then - # Install files into specified directory - insinto /var/lib - doins -r "${S}"/projects/stargazer/inst/var/stargazer - - # Correct user and group for files and directories - fowners -R stg:stg /var/lib/stargazer - fi - - if use module_store_firebird ; then - # Install files into specified directory - insinto /usr/share/stargazer/db/firebird - doins \ - "${S}"/projects/stargazer/inst/var/00-base-00.sql \ - "${S}"/projects/stargazer/inst/var/00-alter-01.sql - fi - - if use module_store_mysql ; then - # Install file into specified directory - insinto /usr/share/stargazer/db/mysql - doins "${S}"/projects/stargazer/inst/var/00-mysql-01.sql - fi - - if use module_store_postgres ; then - # Install files into specified directory - insinto /usr/share/stargazer/db/postgresql - doins \ - "${S}"/projects/stargazer/inst/var/00-base-00.postgresql.sql \ - "${S}"/projects/stargazer/inst/var/00-alter-01.postgresql.sql - fi - - if use module_other_smux ; then - # Install files into specified directory - insinto /usr/share/snmp/mibs - doins "${S}"/projects/stargazer/plugins/other/smux/STG-MIB.mib - fi - - if use module_other_remote_script ; then - # Create subnets file based on example from mod_remote_script.conf - grep 192 "${S}"/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_remote_script.conf \ - | sed 's/# //' > "${ED}"/etc/stargazer/subnets - - # Correct permissions for file - fperms 0640 /etc/stargazer/subnets - fi - - # Correct permissions for files - fperms 0640 \ - /etc/stargazer/rules \ - /etc/stargazer/stargazer.conf - - # Install files into specified directory for selected modules - insinto /etc/stargazer/conf-available.d - insopts -m 0640 - - local module - for module in ${!MODULES[@]} ; do - use $module && doins "${S}"/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/${MODULES[$module]#*:}.conf - done - - # Create symlinks of configs for selected modules - for module in ${!MODULES[@]} ; do - use $module \ - && dosym \ - /etc/stargazer/conf-available.d/${MODULES[$module]#*:}.conf \ - /etc/stargazer/conf-enabled.d/${MODULES[$module]#*:}.conf - done - fi - - # Correct user and gsroup for files and directories - if use sgconv || use rscriptd || use sgauth || use stargazer ; then - fowners -R stg:stg /etc/stargazer - fi - - # Put the files in the right folder to support multilib - if [ ! -e "${ED}"/usr/$(get_libdir) ] ; then - mv "${ED}"/usr/lib/ "${ED}"/usr/$(get_libdir) \ - || die "Failed to move library directory for multilib support" - fi -} - -pkg_postinst() { - if use sgconv ; then - einfo "\nSgconv:" - einfo "----------" - einfo "For further use edit /etc/stargazer/sgconv.conf." - fi - - if use radius ; then - einfo "\nRadius:" - einfo "-------" - einfo "For further use emerge net-dialup/freeradius.\n" - - einfo "Example config:\n" - - einfo "stg {" - einfo " local_port = 6667" - einfo " server = localhost" - einfo " port = 6666" - einfo " password = 123456" - einfo " }\n" - - einfo "You should place 'stg' into section Instantiate, Authorize." - einfo "In section Authentificate 'stg' should go in sub-section" - einfo "Auth-Type before other authentifications modules:\n" - - einfo "Auth-Type PAP {" - einfo " stg" - einfo " pap" - einfo "}\n" - - einfo "It also may be used in section Accounting and Post-Auth." - - use module_auth_freeradius || einfo "\nFor use RADIUS enable USE-flag module_auth_freeradius." - fi - - if use rscriptd ; then - einfo "\nRemote Script Executer:" - einfo "-----------------------" - einfo "For further use edit /etc/stargazer/rscriptd.conf." - einfo "You have to change 'Password' field at least." - fi - - if use sgauth ; then - einfo "\nSgauth:" - einfo "-------" - einfo "For further use edit /etc/stargazer/sgauth.conf." - einfo "You have to change 'ServerName', 'Login', 'Password' fields at least." - fi - - if use sgconf ; then - einfo "\nSgconf:" - einfo "-------" - use module_config_sgconfig \ - || einfo "For further use enable USE-flag module_config_sgconfig." - fi - - if use sgconf_xml ; then - einfo "\nSgconf_xml:" - einfo "-----------" - use module_config_rpcconfig \ - || einfo "For further use enable USE-flag module_config_rpcconfig." - fi - - if use stargazer ; then - einfo "\nStargazer:" - einfo "----------" - einfo "Modules availability:\n" - if use module_auth_always_online ; then - einfo "* module_auth_always_online available." - fi - if use module_auth_internet_access ; then - einfo "* module_auth_internet_access available." - fi - if use module_auth_freeradius ; then - einfo "* module_auth_freeradius available.\n" - einfo "For further use emerge net-dialup/freeradius.\n" - use radius || einfo "\n For use RADIUS enable use USE-flag radius." - fi - if use module_capture_ipq ; then - einfo "* module_capture_ipq available." - fi - if use module_capture_ether ; then - einfo "* module_capture_ether available." - fi - if use module_capture_netflow ; then - einfo "* module_capture_netflow available.\n" - einfo "For further use emerge any netflow sensor:\n" - einfo "net-firewall/ipt_netflow or net-analyzer/softflowd.\n" - fi - if use module_config_sgconfig ; then - einfo "* module_config_sgconfig available." - fi - if use module_config_rpcconfig ; then - einfo "* module_config_rpcconfig available.\n" - einfo "KNOWN BUG: Sometimes you can't configure Stargazer" - einfo "through xml-based configurator, because module is not responding." - einfo "This bug is introduced by xmlrpc-c library." - einfo "This bug proceeds very rare, but it still exists.\n" - fi - if use module_other_ping ; then - einfo "* module_other_ping available." - fi - if use module_other_smux ; then - einfo "* module_other_smux available.\n" - einfo "For further use emerge net-analyzer/net-snmp.\n" - fi - if use module_other_remote_script ; then - einfo "* module_other_remote_script available.\n" - einfo "For further use edit /etc/stargazer/subnets.\n" - fi - if use module_store_files ; then - einfo "* module_store_files available." - fi - if use module_store_firebird ; then - einfo "* module_store_firebird available.\n" - einfo "You should add 'firebird' user to stg group:\n" - einfo "# usermod -a -G stg firebird\n" - einfo "and restart firebird:\n" - einfo "# /etc/init.d/firebird restart\n" - einfo "Stargazer DB schema for Firebird is here: /usr/share/stargazer/db/firebird" - einfo "For new setup you should execute 00-base-00.sql:\n" - einfo "# fbsql -q -i /usr/share/stargazer/db/firebird/00-base-00.sql\n" - einfo "For upgrade from version 2.406 you should execute 00-alter-01.sql:\n" - einfo "# fbsql -i /usr/share/stargazer/db/firebird/00-alter-01.sql\n" - fi - if use module_store_mysql ; then - einfo "* module_store_mysql available.\n" - einfo "For upgrade from version 2.406 you should execute 00-mysql-01.sql:\n" - einfo "# mysql < /usr/share/stargazer/db/mysql/00-mysql-01.sql\n" - fi - if use module_store_postgres ; then - einfo "* module_store_postgres available.\n" - einfo "DB schema for PostgresSQL is here: /usr/share/stargazer/db/postgresql" - einfo "For new setup you should execute 00-base-00.postgresql.sql:\n" - einfo "# psql -f /usr/share/stargazer/db/postgresql/00-base-00.postgresql.sql\n" - einfo "For upgrade from version 2.406 you should execute 00-alter-01.sql:\n" - einfo "# psql -f /usr/share/stargazer/db/postgresql/00-alter-01.sql\n" - fi - einfo "\n For all storage backends:\n" - einfo "* Default admin login - admin, default admin password - 123456." - einfo "* Default subscriber login - test, default subscriber password - 123456.\n" - einfo "Don't run newer versions without reading their ChangeLog first," - einfo "it can be found in /usr/share/doc/${PF}" - fi - if use debug ; then - ewarn "\nThis is a debug build, avoid to use it in production." - fi -} |