proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

14 files changed, 1821 insertions, 0 deletions

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
new file mode 100644
index 000000000000..c8b73d85a63a
--- /dev/null
+++ b/net-misc/stargazer/files/patches/stg-2.408-build-upstream.patch
@@ -0,0 +1,214 @@
+--- projects/rlm_stg/build.org	2013-01-15 15:25:59.000000000 +0200
++++ 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"
+--- projects/rscriptd/build.org	2013-01-15 18:28:32.000000000 +0200
++++ 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"
+--- projects/sgauth/build.org	2013-01-15 18:29:20.000000000 +0200
++++ 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"
+--- projects/sgconf/build.org	2013-01-15 18:29:59.000000000 +0200
++++ 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"
+--- projects/sgconf_xml/build.org	2013-01-15 18:30:26.000000000 +0200
++++ 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"
+--- projects/sgconv/build.org	2013-01-15 18:31:01.000000000 +0200
++++ 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
+--- projects/stargazer/build.org	2013-01-15 19:48:54.000000000 +0200
++++ 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
new file mode 100644
index 000000000000..380b4cbe91f2
--- /dev/null
+++ b/net-misc/stargazer/files/patches/stg-2.408-build.patch
@@ -0,0 +1,179 @@
+--- projects/rlm_stg/configure.org	2013-01-18 18:06:17.000000000 +0200
++++ 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
+--- projects/rscriptd/configure.org	2013-01-18 18:07:28.000000000 +0200
++++ 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
+--- projects/sgauth/configure.org	2013-01-18 18:08:10.000000000 +0200
++++ 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
+--- projects/sgconf/configure.org	2013-01-18 18:08:46.000000000 +0200
++++ 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
+--- projects/sgconf_xml/configure.org	2013-01-18 18:09:54.000000000 +0200
++++ 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
+--- projects/sgconv/configure.org	2013-01-18 18:10:30.000000000 +0200
++++ 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
+--- projects/stargazer/configure.org	2013-01-18 18:11:15.000000000 +0200
++++ 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
new file mode 100644
index 000000000000..82698af5b6f7
--- /dev/null
+++ b/net-misc/stargazer/files/patches/stg-2.408-correct-paths.patch
@@ -0,0 +1,186 @@
+--- projects/rscriptd/rscriptd.conf.org	2013-01-08 18:19:34.000000000 +0200
++++ 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
+--- projects/sgconv/sgconv.conf.org	2012-12-18 21:56:33.578221904 +0200
++++ 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
+--- projects/stargazer/inst/linux/etc/stargazer/stargazer.conf.org	2012-12-30 14:35:22.000000000 +0200
++++ 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
+--- projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_remote_script.conf.org	2012-12-25 14:03:49.000000000 +0200
++++ 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
+--- projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_files.conf.org	2012-12-25 13:31:01.000000000 +0200
++++ 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>
+--- projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_firebird.conf.org	2012-12-25 13:39:00.000000000 +0200
++++ 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
+--- projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp.org	2012-12-31 11:08:26.000000000 +0200
++++ 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)
+         );
+ 
+--- projects/stargazer/inst/var/00-base-00.sql.org	2013-01-02 16:22:28.000000000 +0200
++++ 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
new file mode 100644
index 000000000000..367c91209be7
--- /dev/null
+++ b/net-misc/stargazer/files/patches/stg-2.408-fix-crash-on-stop.patch
@@ -0,0 +1,190 @@
+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
new file mode 100644
index 000000000000..51d0f1f04ea6
--- /dev/null
+++ b/net-misc/stargazer/files/patches/stg-2.408-makefile-build-upstream.patch
@@ -0,0 +1,386 @@
+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
new file mode 100644
index 000000000000..81f46f4a3bfe
--- /dev/null
+++ b/net-misc/stargazer/files/patches/stg-2.408-makefile-firebird-upstream.patch
@@ -0,0 +1,13 @@
+--- projects/stargazer/plugins/store/firebird/Makefile.org	2013-01-04 22:50:13.000000000 +0200
++++ 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
new file mode 100644
index 000000000000..81772d6641fe
--- /dev/null
+++ b/net-misc/stargazer/files/patches/stg-2.408-makefile.patch
@@ -0,0 +1,203 @@
+--- projects/sgauth/Makefile.org	2013-01-05 23:47:38.000000000 +0200
++++ 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
+ 
+--- projects/stargazer/Makefile.org	2013-01-05 22:53:26.000000000 +0200
++++ 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
+ 
+--- projects/rscriptd/Makefile.org	2013-01-19 17:03:42.000000000 +0200
++++ 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
+--- projects/rlm_stg/Makefile.org	2013-02-03 14:02:58.000000000 +0200
++++ 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
+--- projects/rscriptd/Makefile.org	2013-02-03 14:17:01.000000000 +0200
++++ 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:
+--- projects/sgauth/Makefile.org	2013-02-03 14:18:37.000000000 +0200
++++ 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:
+--- projects/sgconf/Makefile.org	2013-02-03 14:19:18.000000000 +0200
++++ 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
+--- projects/sgconf_xml/Makefile.org	2013-02-03 14:19:53.000000000 +0200
++++ 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
+--- projects/sgconv/Makefile.org	2013-02-03 14:20:24.000000000 +0200
++++ 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
+--- projects/stargazer/Makefile.org	2013-02-03 14:20:56.000000000 +0200
++++ 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
+--- stglibs/Makefile.in.org	2013-02-03 14:53:02.000000000 +0200
++++ 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/
+ 
+--- projects/stargazer/plugins/Makefile.in.org	2013-02-03 15:38:41.000000000 +0200
++++ 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
new file mode 100644
index 000000000000..4afbb0340253
--- /dev/null
+++ b/net-misc/stargazer/files/patches/stg-2.408-on-upstream.patch
@@ -0,0 +1,151 @@
+--- projects/stargazer/inst/linux/etc/stargazer/OnChange.org	2013-01-09 14:30:32.000000000 +0200
++++ 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
+--- projects/stargazer/inst/linux/etc/stargazer/OnConnect.org	2013-01-09 14:39:51.000000000 +0200
++++ 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
+--- projects/stargazer/inst/linux/etc/stargazer/OnDisconnect.org	2013-01-09 14:54:36.000000000 +0200
++++ 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
+--- projects/stargazer/inst/linux/etc/stargazer/OnUserAdd.org	2013-01-09 15:01:57.000000000 +0200
++++ 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
+--- projects/stargazer/inst/linux/etc/stargazer/OnUserDel.org	2013-01-09 15:12:32.000000000 +0200
++++ 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
new file mode 100644
index 000000000000..790cc3a91e1e
--- /dev/null
+++ b/net-misc/stargazer/files/patches/stg-2.408-radius-upstream.patch
@@ -0,0 +1,31 @@
+--- projects/rlm_stg/Makefile.org	2013-01-18 16:17:18.000000000 +0200
++++ 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
new file mode 100644
index 000000000000..4e97da2f80e3
--- /dev/null
+++ b/net-misc/stargazer/files/patches/stg-2.408-rscriptd-upstream.patch
@@ -0,0 +1,26 @@
+--- projects/rscriptd/Makefile.org	2013-01-18 16:22:46.000000000 +0200
++++ 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
new file mode 100644
index 000000000000..21746e59e8d1
--- /dev/null
+++ b/net-misc/stargazer/files/patches/stg-2.408-rscriptd.conf-upstream.patch
@@ -0,0 +1,80 @@
+--- projects/rscriptd/rscriptd.conf.org	2013-01-12 15:44:46.000000000 +0200
++++ 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
new file mode 100644
index 000000000000..213d35fd2db7
--- /dev/null
+++ b/net-misc/stargazer/files/patches/stg-2.408-sgauth.conf-upstream.patch
@@ -0,0 +1,112 @@
+--- projects/sgauth/sgauth.conf.org	2013-01-08 15:43:09.000000000 +0200
++++ 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
new file mode 100644
index 000000000000..cfce675b1287
--- /dev/null
+++ b/net-misc/stargazer/files/patches/stg-2.408-sgconv-upstream.patch
@@ -0,0 +1,40 @@
+--- projects/sgconv/Makefile.org	2013-01-08 12:07:06.000000000 +0200
++++ 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
+--- projects/sgconv/build.org	2012-02-09 12:26:57.000000000 +0200
++++ 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 
+--- projects/sgconv/settings_impl.h.org	2013-01-08 12:11:53.000000000 +0200
++++ 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
new file mode 100644
index 000000000000..723d177ac79a
--- /dev/null
+++ b/net-misc/stargazer/files/patches/stg-2.408-static-libs.patch
@@ -0,0 +1,10 @@
+--- stglibs/Makefile.org	2013-01-19 18:21:57.000000000 +0200
++++ stglibs/Makefile	2013-01-19 18:24:25.000000000 +0200
+@@ -15,6 +15,6 @@
+ 
+ clean: all
+ 
+-install: all
++install:
+ 
+ uninstall: all