Current state

diff --git a/init.d/ntpd b/init.d/ntpd
index a5bd1ffc598d7221fbdc78e6d15c8380dd3a058f..53533e78df77a7641c7ff29631ee119e3148ae0d 100755 (executable)
--- a/init.d/ntpd
+++ b/init.d/ntpd
@@ -1,14 +1,20 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd.rc,v 1.24 2010/07/18 21:53:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd.rc-r1,v 1.1 2014/12/22 08:42:22 polynomial-c Exp $
+
+description="ntpd - the network time protocol daemon"
+pidfile="/var/run/ntpd.pid"
+command="/usr/sbin/ntpd"
+command_args="-p ${pidfile} ${NTPD_OPTS}"
+start_stop_daemon_args="--pidfile ${pidfile}"
 
 depend() {
        use net dns logger
        after ntp-client
 }
 
-checkconfig() {
+start_pre() {
        if [ ! -f /etc/ntp.conf ] ; then
                eerror "Please create /etc/ntp.conf"
                eerror "Sample conf: /usr/share/ntp/ntp.conf"
@@ -16,21 +22,3 @@ checkconfig() {
        fi
        return 0
 }
-
-start() {
-       checkconfig || return $?
-
-       ebegin "Starting ntpd"
-       start-stop-daemon --start --exec /usr/sbin/ntpd \
-           --pidfile /var/run/ntpd.pid \
-           -- -p /var/run/ntpd.pid ${NTPD_OPTS}
-       eend $? "Failed to start ntpd"
-}
-
-stop() {
-       ebegin "Stopping ntpd"
-       start-stop-daemon --stop \
-               --pidfile /var/run/ntpd.pid \
-               --exec /usr/sbin/ntpd
-       eend $? "Failed to stop ntpd"
-}

diff --git a/pango/x86_64-pc-linux-gnu/pango.modules b/pango/x86_64-pc-linux-gnu/pango.modules
deleted file mode 100644 (file)
index 7585325..0000000
--- a/pango/x86_64-pc-linux-gnu/pango.modules
+++ /dev/null
@@ -1,16 +0,0 @@
-# Pango Modules file
-# Automatically generated file, do not edit
-#
-/usr/lib64/pango/1.8.0/modules/pango-arabic-lang.so ArabicScriptEngineLang PangoEngineLang PangoRenderNone arabic:*
-/usr/lib64/pango/1.8.0/modules/pango-basic-fc.so BasicScriptEngineFc PangoEngineShape PangoRenderFc common:
-/usr/lib64/pango/1.8.0/modules/pango-indic-lang.so devaIndicScriptEngineLang PangoEngineLang PangoRenderNone devanagari:*
-/usr/lib64/pango/1.8.0/modules/pango-indic-lang.so bengIndicScriptEngineLang PangoEngineLang PangoRenderNone bengali:*
-/usr/lib64/pango/1.8.0/modules/pango-indic-lang.so guruIndicScriptEngineLang PangoEngineLang PangoRenderNone gurmukhi:*
-/usr/lib64/pango/1.8.0/modules/pango-indic-lang.so gujrIndicScriptEngineLang PangoEngineLang PangoRenderNone gujarati:*
-/usr/lib64/pango/1.8.0/modules/pango-indic-lang.so oryaIndicScriptEngineLang PangoEngineLang PangoRenderNone oriya:*
-/usr/lib64/pango/1.8.0/modules/pango-indic-lang.so tamlIndicScriptEngineLang PangoEngineLang PangoRenderNone tamil:*
-/usr/lib64/pango/1.8.0/modules/pango-indic-lang.so teluIndicScriptEngineLang PangoEngineLang PangoRenderNone telugu:*
-/usr/lib64/pango/1.8.0/modules/pango-indic-lang.so kndaIndicScriptEngineLang PangoEngineLang PangoRenderNone kannada:*
-/usr/lib64/pango/1.8.0/modules/pango-indic-lang.so mlymIndicScriptEngineLang PangoEngineLang PangoRenderNone malayalam:*
-/usr/lib64/pango/1.8.0/modules/pango-indic-lang.so sinhIndicScriptEngineLang PangoEngineLang PangoRenderNone sinhala:*
-

diff --git a/php/apache2-php5.5/php.ini b/php/apache2-php5.5/php.ini
index 717f4f95817b0a6a16498b679ae5ba39de4fff40..8d5ae6c106264d4b2d98c12805e30770ebdd77a2 100644 (file)
--- a/php/apache2-php5.5/php.ini
+++ b/php/apache2-php5.5/php.ini
@@ -293,20 +293,17 @@ serialize_precision = 17
 
 ; open_basedir, if set, limits all file operations to the defined directory
 ; and below.  This directive makes most sense if used in a per-directory
-; or per-virtualhost web server configuration file. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; or per-virtualhost web server configuration file.
 ; http://php.net/open-basedir
 ;open_basedir =
 
 ; This directive allows you to disable certain functions for security reasons.
-; It receives a comma-delimited list of function names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; It receives a comma-delimited list of function names.
 ; http://php.net/disable-functions
 disable_functions =
 
 ; This directive allows you to disable certain classes for security reasons.
-; It receives a comma-delimited list of class names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; It receives a comma-delimited list of class names.
 ; http://php.net/disable-classes
 disable_classes =
 
@@ -1005,7 +1002,7 @@ smtp_port = 25
 
 ; Force the addition of the specified parameters to be passed as extra parameters
 ; to the sendmail binary. These parameters will always replace the value of
-; the 5th parameter to mail(), even in safe mode.
+; the 5th parameter to mail().
 ;mail.force_extra_parameters =
 
 ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename

diff --git a/php/cgi-php5.5/php.ini b/php/cgi-php5.5/php.ini
index 717f4f95817b0a6a16498b679ae5ba39de4fff40..8d5ae6c106264d4b2d98c12805e30770ebdd77a2 100644 (file)
--- a/php/cgi-php5.5/php.ini
+++ b/php/cgi-php5.5/php.ini
@@ -293,20 +293,17 @@ serialize_precision = 17
 
 ; open_basedir, if set, limits all file operations to the defined directory
 ; and below.  This directive makes most sense if used in a per-directory
-; or per-virtualhost web server configuration file. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; or per-virtualhost web server configuration file.
 ; http://php.net/open-basedir
 ;open_basedir =
 
 ; This directive allows you to disable certain functions for security reasons.
-; It receives a comma-delimited list of function names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; It receives a comma-delimited list of function names.
 ; http://php.net/disable-functions
 disable_functions =
 
 ; This directive allows you to disable certain classes for security reasons.
-; It receives a comma-delimited list of class names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; It receives a comma-delimited list of class names.
 ; http://php.net/disable-classes
 disable_classes =
 
@@ -1005,7 +1002,7 @@ smtp_port = 25
 
 ; Force the addition of the specified parameters to be passed as extra parameters
 ; to the sendmail binary. These parameters will always replace the value of
-; the 5th parameter to mail(), even in safe mode.
+; the 5th parameter to mail().
 ;mail.force_extra_parameters =
 
 ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename

diff --git a/php/cli-php5.5/php.ini b/php/cli-php5.5/php.ini
index 717f4f95817b0a6a16498b679ae5ba39de4fff40..8d5ae6c106264d4b2d98c12805e30770ebdd77a2 100644 (file)
--- a/php/cli-php5.5/php.ini
+++ b/php/cli-php5.5/php.ini
@@ -293,20 +293,17 @@ serialize_precision = 17
 
 ; open_basedir, if set, limits all file operations to the defined directory
 ; and below.  This directive makes most sense if used in a per-directory
-; or per-virtualhost web server configuration file. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; or per-virtualhost web server configuration file.
 ; http://php.net/open-basedir
 ;open_basedir =
 
 ; This directive allows you to disable certain functions for security reasons.
-; It receives a comma-delimited list of function names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; It receives a comma-delimited list of function names.
 ; http://php.net/disable-functions
 disable_functions =
 
 ; This directive allows you to disable certain classes for security reasons.
-; It receives a comma-delimited list of class names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; It receives a comma-delimited list of class names.
 ; http://php.net/disable-classes
 disable_classes =
 
@@ -1005,7 +1002,7 @@ smtp_port = 25
 
 ; Force the addition of the specified parameters to be passed as extra parameters
 ; to the sendmail binary. These parameters will always replace the value of
-; the 5th parameter to mail(), even in safe mode.
+; the 5th parameter to mail().
 ;mail.force_extra_parameters =
 
 ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename

diff --git a/php/embed-php5.5/php.ini b/php/embed-php5.5/php.ini
index 717f4f95817b0a6a16498b679ae5ba39de4fff40..8d5ae6c106264d4b2d98c12805e30770ebdd77a2 100644 (file)
--- a/php/embed-php5.5/php.ini
+++ b/php/embed-php5.5/php.ini
@@ -293,20 +293,17 @@ serialize_precision = 17
 
 ; open_basedir, if set, limits all file operations to the defined directory
 ; and below.  This directive makes most sense if used in a per-directory
-; or per-virtualhost web server configuration file. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; or per-virtualhost web server configuration file.
 ; http://php.net/open-basedir
 ;open_basedir =
 
 ; This directive allows you to disable certain functions for security reasons.
-; It receives a comma-delimited list of function names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; It receives a comma-delimited list of function names.
 ; http://php.net/disable-functions
 disable_functions =
 
 ; This directive allows you to disable certain classes for security reasons.
-; It receives a comma-delimited list of class names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; It receives a comma-delimited list of class names.
 ; http://php.net/disable-classes
 disable_classes =
 
@@ -1005,7 +1002,7 @@ smtp_port = 25
 
 ; Force the addition of the specified parameters to be passed as extra parameters
 ; to the sendmail binary. These parameters will always replace the value of
-; the 5th parameter to mail(), even in safe mode.
+; the 5th parameter to mail().
 ;mail.force_extra_parameters =
 
 ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename

diff --git a/php/fpm-php5.5/php.ini b/php/fpm-php5.5/php.ini
index 717f4f95817b0a6a16498b679ae5ba39de4fff40..8d5ae6c106264d4b2d98c12805e30770ebdd77a2 100644 (file)
--- a/php/fpm-php5.5/php.ini
+++ b/php/fpm-php5.5/php.ini
@@ -293,20 +293,17 @@ serialize_precision = 17
 
 ; open_basedir, if set, limits all file operations to the defined directory
 ; and below.  This directive makes most sense if used in a per-directory
-; or per-virtualhost web server configuration file. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; or per-virtualhost web server configuration file.
 ; http://php.net/open-basedir
 ;open_basedir =
 
 ; This directive allows you to disable certain functions for security reasons.
-; It receives a comma-delimited list of function names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; It receives a comma-delimited list of function names.
 ; http://php.net/disable-functions
 disable_functions =
 
 ; This directive allows you to disable certain classes for security reasons.
-; It receives a comma-delimited list of class names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; It receives a comma-delimited list of class names.
 ; http://php.net/disable-classes
 disable_classes =
 
@@ -1005,7 +1002,7 @@ smtp_port = 25
 
 ; Force the addition of the specified parameters to be passed as extra parameters
 ; to the sendmail binary. These parameters will always replace the value of
-; the 5th parameter to mail(), even in safe mode.
+; the 5th parameter to mail().
 ;mail.force_extra_parameters =
 
 ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename

diff --git a/portage b/portage
index 38f33c0213a8bce29ea96a28b5e3f9dbe887f901..3f66ed270cb7e59d3a726fb815a1509ea4a6dcfc 160000 (submodule)
--- a/portage
+++ b/portage
@@ -1 +1 @@
-Subproject commit 38f33c0213a8bce29ea96a28b5e3f9dbe887f901
+Subproject commit 3f66ed270cb7e59d3a726fb815a1509ea4a6dcfc