Mercurial > hg > portage
changeset 367:955e226c86a9
Automated merge with https://localhost/hg/portage
| author | Dirk Olmes <dirk@xanthippe.ping.de> |
|---|---|
| date | Tue, 11 Nov 2014 09:54:43 +0100 |
| parents | f7cee22c1ff2 (diff) 477c452d717b (current diff) |
| children | 9c0597d116b5 |
| files | dev-perl/SVN-Notify/SVN-Notify-2.81.ebuild |
| diffstat | 38 files changed, 13 insertions(+), 3000 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app-misc/direvent/Manifest Tue Nov 11 09:54:43 2014 +0100 @@ -0,0 +1,2 @@ +DIST direvent-5.0.tar.gz 742586 SHA256 1fbd26ce98a4e752e82c3b5a0ae85d3360f1fb273c5ef373dc1c55e3c30824c4 SHA512 9019d3ff532a4c15d1bd1cd78a9e9b3bdc34b1f0b8efb74ef9b3083a4d17cadc3a0b6fd5f54022e70206637fd94053da94a5caa88769d27ca9e56e2a12f304ae WHIRLPOOL 9857e5e73759d5b3066738aff546923afc08d8771bad0c7ffd3cd9a0916b23ee404143b12301f5cc5d72cd87c342615379ca4abb102e633f524d596139f4db29 +EBUILD direvent-5.0.ebuild 223 SHA256 73a2e834ddfb9b19e1296e9630cf999a3c461b980e69eec7e1d7a455e40e11fb SHA512 0372dc0bed9340c173e132c20c334438ed9caac32a14565f20fbc3ad318915c6e8977a8678b8b4b02397d8aedc22c6a35b1e18547a269825147751522fdc90ea WHIRLPOOL 553f52f94844b08eb21d52aae327e034abc250e94b5c8247d71ccef25353eddd99b0897c902fc0e03dfebe5c0529b28ae2a7ef5cf333866d1be18fba25cf1f70
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app-misc/direvent/direvent-5.0.ebuild Tue Nov 11 09:54:43 2014 +0100 @@ -0,0 +1,11 @@ + +EAPI=5 + +SRC_URI="http://ftp.gnu.org/gnu/${PN}/${P}.tar.gz" +DESCRIPTION="Directory event monitoring daemon" +HOMEPAGE="http://www.gnu.org.ua/software/direvent/direvent.html" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +
--- a/dev-lang/php/Manifest Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -AUX 20php5-envd 145 RMD160 8c81fb7dc1d1ddf16fd956d748514db3bcb27603 SHA1 f1cef57c0def8e2c5422aaf136f40b4ff47801d2 SHA256 efaae9e6ae5f7010e073c2ab6d8a9dda009f0707c7d7b0c027e142c94f7041a4 -AUX 70_mod_php5.conf-apache2 348 RMD160 9f3f49a52ebf92c2650501c5ceb6f95ce4bb2e76 SHA1 62992e793446b4a9a64900d1ecba7bae06873382 SHA256 5bb8a45570582b4389a7d3feea0398e1c13ed4ced96e559b9406ed8c965dea8c -AUX eblits/src_compile-v1.eblit 1283 RMD160 83fbb374e2dfaa9d164e6b32b57c268ed06bf519 SHA1 09124cbc9008bfb72eb24cd24b2319d22df52c2c SHA256 5ec76ae24304c5f803a615a98394c219018da1b1ce2018f92f6ac8c5becf6c99 -AUX eblits/src_configure-v521.eblit 10844 RMD160 90513f59b5f17d680004d3e74581d9eedc8af490 SHA1 a369e2cf7816799f7e2bead8b6eccc2115d0ecdc SHA256 ad875ca45e9ad975c0d7a3cbedc27c5035aa048d7aa935221a15e47cbca63c3d -AUX eblits/src_install-v2.eblit 5237 RMD160 d1368ba2f7dfe52e8440afea6c5056fd738f5c10 SHA1 b0df591e1b093bdf08414e21a47bfcf5f09b09ac SHA256 860bf8ada8a4900d6a4bdd29bab3e65aff29ba8ddbbba4bec50d9d29c6990ca4 -AUX eblits/src_prepare-v2.eblit 2604 RMD160 379dbca3e2ae8c1f09f608220ec9c98d099cb792 SHA1 42afae4e07633535ecea49817f5badd559f10ff1 SHA256 fe7534260fb81a012b8021b5d555756ce8733ad192bf51cedd94f12963811790 -AUX eblits/src_test-v1.eblit 1557 RMD160 2afc2b505f2b4bd786635e5b7e997248e93009c3 SHA1 070c2b58b55fc2cec939d7a333057506413e8e99 SHA256 81e9ecf94793377e42508d9e57cd7ab3faff78bce722b84b63999a23bdb2098a -DIST php-5.2.17.tar.bz2 9092312 RMD160 567fa8d718b93fb83a89494c83a8bec224ac99e9 SHA1 d68f3b09f766990d815a3c4c63c157db8dab8095 SHA256 e81beb13ec242ab700e56f366e9da52fd6cf18961d155b23304ca870e53f116c -DIST php-patchset-5.2.17-r0.tar.bz2 8369 RMD160 544af4eb2de8e4478e675810f18a5b494b59709b SHA1 7b3c56437b435f60f72f7af08112e77c01e2f827 SHA256 fb159a02faf5120dd9bc620bd3f3094735f181aa6893273bb7dd29771b8b23b2 -DIST suhosin-patch-5.2.16-0.9.7.patch.gz 23069 RMD160 b28b70faf136b3e04c5b483da0f4c2279378f43a SHA1 fec10b2b81582d06bb0d0a96ea55c525afc8ab29 SHA256 aae115a318d80b3f32cedf876e7a8e4b932febb1b0c743c0b398003ebe122f91 -EBUILD php-5.2.17.ebuild 11400 RMD160 442ce96fc819167fe093b1ff754da17b98812805 SHA1 e808e9b24dcfee8f75e8ea465b964a965151f513 SHA256 1e82c08f4348f02817a0932030ecfaa741de1933edda9e884042b9a83aa6b267
--- a/dev-lang/php/files/20php5-envd Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -MANPATH="/usr/lib/php5/man/" -CONFIG_PROTECT_MASK="/etc/php/cli-php5/ext-active/ /etc/php/cgi-php5/ext-active/ /etc/php/apache2-php5/ext-active/"
--- a/dev-lang/php/files/70_mod_php5.conf-apache2 Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -<IfDefine PHP5> - # Load the module first - <IfModule !mod_php5.c> - LoadModule php5_module modules/libphp5.so - </IfModule> - - # Set it to handle the files - <IfModule mod_mime.c> - AddHandler application/x-httpd-php .php .php5 .phtml - AddHandler application/x-httpd-php-source .phps - </IfModule> - - DirectoryIndex index.php index.phtml -</IfDefine>
--- a/dev-lang/php/files/eblits/src_compile-v1.eblit Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,60 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_compile-v1.eblit,v 1.6 2010/08/14 19:37:31 mabi Exp $ - -eblit-php-src_compile() { - # snmp seems to run during src_compile, too (bug #324739) - addpredict /usr/share/snmp/mibs/.index - - SAPI_DIR="${WORKDIR}/sapis" - - for sapi in ${SAPIS} ; do - use "${sapi}" || continue - - php_sapi_build "${sapi}" - php_sapi_copy "${sapi}" - done -} - -php_sapi_build() { - mkdir -p "${SAPI_DIR}/$1" - - cd "${WORKDIR}/sapis-build/$1" - emake || die "emake failed" -} - -php_sapi_copy() { - local sapi="$1" - local source="" - - case "$sapi" in - cli) - source="sapi/cli/php" - ;; - cgi) - source="sapi/cgi/php-cgi" - ;; - fpm) - source="sapi/fpm/php-fpm" - ;; - embed) - source="libs/libphp${PHP_MV}.so" - ;; - - apache2) - # apache2 is a special case; the necessary files - # (yes, multiple) are copied by make install, not - # by the ebuild; that's the reason, why apache2 has - # to be the last sapi - emake INSTALL_ROOT="${SAPI_DIR}/${sapi}/" install-sapi - ;; - - *) - die "unhandled sapi in php_sapi_copy" - ;; - esac - - if [[ "${source}" ]] ; then - cp "$source" "${SAPI_DIR}/$sapi" || die "Unable to copy ${sapi} SAPI" - fi -}
--- a/dev-lang/php/files/eblits/src_configure-v521.eblit Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,273 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v521.eblit,v 1.1 2010/10/08 18:25:10 olemarkus Exp $ - -eblit-php-src_configure() { - export CFLAGS="${CFLAGS} -D_GNU_SOURCE" - PHP_DESTDIR="/usr/$(get_libdir)/php${SLOT}" - - # This is a global variable and should be in caps. It isn't because the - # phpconfutils eclass relies on exactly this name... - my_conf=" - --prefix="${PHP_DESTDIR}" - --mandir="${PHP_DESTDIR}"/man - --infodir="${PHP_DESTDIR}"/info - --libdir="${PHP_DESTDIR}"/lib - --with-libdir=$(get_libdir) - --without-pear - $(use_enable threads maintainer-zts)" - - phpconfutils_init - - # extension USE flag shared - phpconfutils_extension_enable "bcmath" "bcmath" 1 - phpconfutils_extension_with "bz2" "bzip2" 1 - phpconfutils_extension_enable "calendar" "calendar" 1 - phpconfutils_extension_disable "ctype" "ctype" 0 - phpconfutils_extension_with "curl" "curl" 1 - phpconfutils_extension_with "curlwrappers" "curlwrappers" 0 - phpconfutils_extension_enable "dbase" "dbase" 1 - phpconfutils_extension_disable "dom" "xml" 0 - phpconfutils_extension_enable "exif" "exif" 1 - phpconfutils_extension_with "fbsql" "frontbase" 1 - phpconfutils_extension_with "fdftk" "fdftk" 1 "/opt/fdftk-6.0" - phpconfutils_extension_disable "filter" "filter" 0 - phpconfutils_extension_enable "ftp" "ftp" 1 - phpconfutils_extension_with "gettext" "nls" 1 - phpconfutils_extension_with "gmp" "gmp" 1 - phpconfutils_extension_disable "hash" "hash" 0 - phpconfutils_extension_without "iconv" "iconv" 0 - phpconfutils_extension_disable "ipv6" "ipv6" 0 - phpconfutils_extension_disable "json" "json" 0 - phpconfutils_extension_with "kerberos" "kerberos" 0 "/usr" - phpconfutils_extension_disable "libxml" "xml" 0 - phpconfutils_extension_enable "mbstring" "unicode" 1 - phpconfutils_extension_with "mcrypt" "crypt" 1 - phpconfutils_extension_with "mhash" "mhash" 1 - phpconfutils_extension_with "msql" "msql" 1 - phpconfutils_extension_with "mssql" "mssql" 1 - phpconfutils_extension_with "ncurses" "ncurses" 1 - phpconfutils_extension_with "openssl" "ssl" 0 - phpconfutils_extension_with "openssl-dir" "ssl" 0 "/usr" - phpconfutils_extension_enable "pcntl" "pcntl" 1 - phpconfutils_extension_without "pcre-regex" "pcre" 0 - phpconfutils_extension_disable "pdo" "pdo" 0 - phpconfutils_extension_with "pgsql" "postgres" 1 - phpconfutils_extension_disable "posix" "posix" 0 - phpconfutils_extension_with "pspell" "spell" 1 - phpconfutils_extension_with "recode" "recode" 1 - phpconfutils_extension_disable "reflection" "reflection" 0 - phpconfutils_extension_disable "simplexml" "simplexml" 0 - phpconfutils_extension_enable "shmop" "sharedmem" 0 - phpconfutils_extension_with "snmp" "snmp" 1 - phpconfutils_extension_enable "soap" "soap" 1 - phpconfutils_extension_enable "sockets" "sockets" 1 - phpconfutils_extension_disable "spl" "spl" 0 - phpconfutils_extension_with "sybase-ct" "sybase-ct" 1 - phpconfutils_extension_enable "sysvmsg" "sysvipc" 1 - phpconfutils_extension_enable "sysvsem" "sysvipc" 1 - phpconfutils_extension_enable "sysvshm" "sysvipc" 1 - phpconfutils_extension_with "tidy" "tidy" 1 - phpconfutils_extension_disable "tokenizer" "tokenizer" 0 - phpconfutils_extension_enable "wddx" "wddx" 1 - phpconfutils_extension_disable "xml" "xml" 0 - phpconfutils_extension_disable "xmlreader" "xmlreader" 0 - phpconfutils_extension_disable "xmlwriter" "xmlwriter" 0 - phpconfutils_extension_with "xmlrpc" "xmlrpc" 1 - phpconfutils_extension_with "xsl" "xsl" 1 - phpconfutils_extension_enable "zip" "zip" 1 - phpconfutils_extension_with "zlib" "zlib" 1 - phpconfutils_extension_enable "debug" "debug" 0 - - # DBA support - if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ - || use qdbm ; then - my_conf="${my_conf} --enable-dba${shared}" - fi - - # DBA drivers support - phpconfutils_extension_with "cdb" "cdb" 0 - phpconfutils_extension_with "db4" "berkdb" 0 - phpconfutils_extension_enable "flatfile" "flatfile" 0 - phpconfutils_extension_with "gdbm" "gdbm" 0 - phpconfutils_extension_enable "inifile" "inifile" 0 - phpconfutils_extension_with "qdbm" "qdbm" 0 - - # Support for the GD graphics library - if use gd-external ; then - phpconfutils_extension_with "freetype-dir" "truetype" 0 "/usr" - phpconfutils_extension_with "t1lib" "truetype" 0 "/usr" - phpconfutils_extension_enable "gd-jis-conv" "cjk" 0 - phpconfutils_extension_with "gd" "gd-external" 1 "/usr" - else - phpconfutils_extension_with "freetype-dir" "truetype" 0 "/usr" - phpconfutils_extension_with "t1lib" "truetype" 0 "/usr" - phpconfutils_extension_enable "gd-jis-conv" "cjk" 0 - phpconfutils_extension_with "jpeg-dir" "gd" 0 "/usr" - phpconfutils_extension_with "png-dir" "gd" 0 "/usr" - phpconfutils_extension_with "xpm-dir" "xpm" 0 "/usr" - # enable gd last, so configure can pick up the previous settings - phpconfutils_extension_with "gd" "gd" 0 - fi - - # IMAP support - if use imap ; then - phpconfutils_extension_with "imap" "imap" 1 - phpconfutils_extension_with "imap-ssl" "ssl" 0 - fi - - phpconfutils_extension_with "interbase" "interbase" 0 "/opt" - phpconfutils_extension_with "interbase" "firebird" 0 "/usr" - - # LDAP support - if use ldap ; then - if use oci8 ; then - phpconfutils_extension_with "ldap" "ldap" 1 "${ORACLE_HOME}" - else - phpconfutils_extension_with "ldap" "ldap" 1 - phpconfutils_extension_with "ldap-sasl" "ldap-sasl" 0 - fi - fi - - # MySQL support - if use mysql ; then - phpconfutils_extension_with "mysql" "mysql" 1 "/usr" - phpconfutils_extension_with "mysql-sock" "mysql" 0 "/var/run/mysqld/mysqld.sock" - fi - - # MySQLi support - phpconfutils_extension_with "mysqli" "mysqli" 1 "/usr/bin/mysql_config" - - # ODBC support - if use odbc ; then - phpconfutils_extension_with "unixODBC" "odbc" 1 "/usr" - phpconfutils_extension_with "adabas" "adabas" 1 - phpconfutils_extension_with "birdstep" "birdstep" 1 - phpconfutils_extension_with "dbmaker" "dbmaker" 1 - phpconfutils_extension_with "empress" "empress" 1 - if use empress ; then - phpconfutils_extension_with "empress-bcs" "empress-bcs" 0 - fi - phpconfutils_extension_with "esoob" "esoob" 1 - # Needed to run conftest for IBM DB2 - [[ -n ${DB2_HOME} ]] && export LD_LIBRARY_PATH="${DB2_HOME}/`get_libdir`" - phpconfutils_extension_with "ibm-db2" "db2" 1 "${DB2_HOME}" - phpconfutils_extension_with "sapdb" "sapdb" 1 - phpconfutils_extension_with "solid" "solid" 1 - fi - - if use iodbc ; then - phpconfutils_extension_with "iodbc" "iodbc" 1 "/usr" - fi - - # Oracle support - phpconfutils_extension_with "oci8" "oci8" 1 - if use oci8-instant-client ; then - OCI8IC_PKG="$(best_version dev-db/oracle-instantclient-basic | \ - sed -e 's|dev-db/oracle-instantclient-basic-||g' | \ - sed -e 's|-r.*||g')" - - phpconfutils_extension_with "oci8" "oci8-instant-client" 1 \ - "instantclient,/usr/lib/oracle/${OCI8IC_PKG}/client/lib" - fi - - # PDO support - if use pdo ; then - phpconfutils_extension_with "pdo-dblib" "mssql" 1 - phpconfutils_extension_with "pdo-mysql" "mysql" 1 "/usr" - phpconfutils_extension_with "pdo-pgsql" "postgres" 1 - phpconfutils_extension_with "pdo-sqlite" "sqlite" 1 "/usr" - phpconfutils_extension_with "pdo-odbc" "odbc" 1 "unixODBC,/usr" - if use oci8 ; then - phpconfutils_extension_with "pdo-oci" "oci8" 1 - fi - if use oci8-instant-client ; then - phpconfutils_extension_with "pdo-oci" "oci8-instant-client" 1 \ - "instantclient,/usr,${OCI8IC_PKG}" - fi - fi - - # readline/libedit support - phpconfutils_extension_with "readline" "readline" 0 - phpconfutils_extension_with "libedit" "libedit" 0 - - # Session support - if use session ; then - phpconfutils_extension_with "mm" "sharedmem" 0 - else - phpconfutils_extension_disable "session" "session" 0 - fi - - # SQLite support - if use sqlite ; then - phpconfutils_extension_with "sqlite" "sqlite" 0 "/usr" - phpconfutils_extension_enable "sqlite-utf8" "unicode" 0 - else - phpconfutils_extension_without "sqlite" "sqlite" 0 - fi - - if use pic ; then - my_conf="${my_conf} --with-pic" - fi - - - # we use the system copy of pcre - # --with-pcre-regex affects ext/pcre - # --with-pcre-dir affects ext/filter and ext/zip - if use pcre ; then - my_conf="${my_conf} --with-pcre-regex=/usr --with-pcre-dir=/usr" - fi - - # Catch CFLAGS problems - php_check_cflags - - # Support user-passed configuration parameters - my_conf="${my_conf} ${EXTRA_ECONF:-}" - - # Support the Apache2 extras, they must be set globally for all - # SAPIs to work correctly, especially for external PHP extensions - - mkdir -p "${WORKDIR}/sapis-build" - for one_sapi in $SAPIS ; do - use "${one_sapi}" || continue - php_set_ini_dir "${one_sapi}" - - cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}" - cd "${WORKDIR}/sapis-build/${one_sapi}" - - sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR} - --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}" - - for sapi in $SAPIS ; do - case "$sapi" in - cli|embed) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf="${sapi_conf} --enable-${sapi}" - else - sapi_conf="${sapi_conf} --disable-${sapi}" - fi - ;; - - cgi) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf+=" --enable-cgi --enable-fastcgi" - use discard-path && sapi_conf+=" --enable-discard-path" - use force-cgi-redirect && sapi_conf+=" --enable-force-cgi-redirect" - else - sapi_conf+=" --disable-${sapi}" - fi - ;; - - apache2) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf="${sapi_conf} --with-apxs2=/usr/sbin/apxs" - else - sapi_conf="${sapi_conf} --without-apxs2" - fi - ;; - esac - done - - econf ${sapi_conf} - done -}
--- a/dev-lang/php/files/eblits/src_install-v2.eblit Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,165 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit,v 1.14 2011/12/16 09:02:43 olemarkus Exp $ - -eblit-php-src_install() { - # see bug #324739 for what happens when we don't have that - addpredict /usr/share/snmp/mibs/.index - - # grab the first SAPI that got built and install common files from there - local first_sapi="" - for sapi in $SAPIS ; do - if use $sapi ; then - first_sapi=$sapi - break - fi - done - - # Makefile forgets to create this before trying to write to it... - dodir "${PHP_DESTDIR}/bin" - - # Install php environment (without any sapis) - cd "${WORKDIR}/sapis-build/$first_sapi" - emake INSTALL_ROOT="${D}" \ - install-build install-headers install-programs \ - || die "emake install failed" - - local extension_dir="$("${D}/${PHP_DESTDIR}/bin/php-config" --extension-dir)" - - # And install the modules to it - if use sharedext ; then - insinto "${extension_dir}" - doins "${WORKDIR}/sapis-build/${first_sapi}/modules/"*.so - fi - - # Create the directory where we'll put version-specific php scripts - keepdir /usr/share/php${PHP_MV} - - local sapi="", file="" - local sapi_list="" - - for sapi in ${SAPIS}; do - if use "${sapi}" ; then - einfo "Installing SAPI: ${sapi}" - cd "${WORKDIR}/sapis-build/${sapi}" - # needed each time, php_install_ini would reset it - into "${PHP_DESTDIR}" - file=$(find "${SAPI_DIR}/${sapi}/" -type f | head -n 1) - - if [[ "${file: -3}" == ".so" ]]; then - if [[ "${sapi}" == "apache2" ]]; then - insinto "${PHP_DESTDIR}/apache2/" - newins "${file}" "${file/*\/}" - keepdir "/usr/$(get_libdir)/apache2/modules" - else - dolib.so "${file}" || die "Unable to install ${sapi} sapi" - fi - else - dobin "${file}" || die "Unable to install ${sapi} sapi" - fi - - php_install_ini "${sapi}" - - # construct correct SAPI string for php-config - # thanks to ferringb for the bash voodoo - if [[ "${sapi}" == "apache2" ]]; then - sapi_list="${sapi_list:+${sapi_list} }apache2handler" - else - sapi_list="${sapi_list:+${sapi_list} }${sapi}" - fi - fi - done - - # Install env.d files - newenvd "${FILESDIR}/20php5-envd" \ - "20php${SLOT}" - sed -e "s|/lib/|/$(get_libdir)/|g" -i \ - "${D}/etc/env.d/20php${SLOT}" - sed -e "s|php5|php${SLOT}|g" -i \ - "${D}/etc/env.d/20php${SLOT}" - - # set php-config variable correctly (bug #278439) - sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ - "${D}/usr/$(get_libdir)/php${SLOT}/bin/php-config" -} - -php_install_ini() { - local phpsapi="${1}" - - # work out where we are installing the ini file - php_set_ini_dir "${phpsapi}" - - local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}" - cp "${PHP_INI_UPSTREAM}" "${phpinisrc}" - - # default to allow_url_open=Off, bug 332763 - sed -e 's|^allow_url_fopen .*|allow_url_fopen = Off|g' -i "${phpinisrc}" - - # default to expose_php=Off, bug 300695 - sed -e 's|^expose_php .*|expose_php = Off|g' -i "${phpinisrc}" - - # default to /tmp for save_path, bug #282768 - sed -e 's|^;session.save_path .*$|session.save_path = "/tmp"|g' -i "${phpinisrc}" - - # Set the extension dir - sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}" - - # Set the include path to point to where we want to find PEAR packages - sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:/usr/share/php'${PHP_MV}':/usr/share/php"|' -i "${phpinisrc}" - - dodir "${PHP_INI_DIR}" - insinto "${PHP_INI_DIR}" - newins "${phpinisrc}" "${PHP_INI_FILE}" - - elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR}" - elog - - dodir "${PHP_EXT_INI_DIR}" - dodir "${PHP_EXT_INI_DIR_ACTIVE}" - - # Install any extensions built as shared objects - if use sharedext ; then - insinto "${PHP_EXT_INI_DIR}" - for extension in "${D}/${extension_dir}/"*.so ; do - extension="${extension##*/}" - inifilename="${extension/.so/.ini}" - echo "extension=${extension}" > "${WORKDIR}/sapis-build/${phpsapi}/modules/$inifilename" - doins "${WORKDIR}/sapis-build/${phpsapi}/modules/$inifilename" - dosym "${PHP_EXT_INI_DIR}/${inifilename}" "${PHP_EXT_INI_DIR_ACTIVE}/${inifilename}" - done - fi - - # SAPI-specific handling - if [[ "${sapi}" == "apache2" ]] ; then - insinto "${APACHE_MODULES_CONFDIR}" - newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \ - "70_mod_php${PHP_MV}.conf" - fi - - if [[ "${sapi}" == "fpm" ]] ; then - [[ -z ${PHP_FPM_INIT_VER} ]] && PHP_FPM_INIT_VER=3 - [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0 - einfo "Installing FPM CGI config file php-fpm.conf" - insinto ${PHP_INI_DIR} - newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf - dodir "/etc/init.d" - insinto "/etc/init.d" - newinitd "${FILESDIR}/php-fpm-r${PHP_FPM_INIT_VER}.init" "php-fpm" - #dosym "${PHP_DESTDIR}/bin/php-fpm" "/usr/bin/php-fpm" - - # Remove bogus /etc/php-fpm.conf.default (bug 359906) - [[ -f "${D}/etc/php-fpm.conf.default" ]] && rm "${D}/etc/php-fpm.conf.default" - fi - - # Install PHP ini files into /usr/share/php - if [[ ${SLOT} == '5.2' ]]; then - newdoc php.ini-dist php.ini-development - newdoc php.ini-recommended php.ini-production - fi - - if [[ ${SLOT} == '5.3' ]]; then - dodoc php.ini-development - dodoc php.ini-production - fi - -}
--- a/dev-lang/php/files/eblits/src_prepare-v2.eblit Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,71 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_prepare-v2.eblit,v 1.3 2011/01/05 11:23:16 mabi Exp $ - -eblit-php-src_prepare() { - # USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path - # ([empty session.save_path]/session_mm_[sapi][gid].sem) - # there is no easy way to circumvent that, all php calls during - # install use -n, so no php.ini file will be used. - # As such, this is the easiest way to get around - addpredict /session_mm_cli250.sem - addpredict /session_mm_cli0.sem - - # kolab support (support for imap annotations) - use kolab && epatch "${WORKDIR}/${PV}/opt/imap-kolab-annotations.patch" - - # Change PHP branding - sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1${PHP_EXTRA_BRANDING}-pl${PR/r/}-gentoo\2|g" \ - -i configure.in || die "Unable to change PHP branding" - - # Apply generic PHP patches - EPATCH_SOURCE="${WORKDIR}/${PV}/generic" EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_MULTI_MSG="Applying generic patches and fixes from upstream..." epatch - - # Patch PHP to show Gentoo as the server platform - sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \ - -i configure.in || die "Failed to fix server platform name" - - # Prevent PHP from activating the Apache config, - # as we will do that ourselves - sed -i \ - -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \ - -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \ - configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 - - # Patch PHP to support heimdal instead of mit-krb5 - if has_version "app-crypt/heimdal" ; then - sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \ - || die "Failed to fix heimdal libname" - sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \ - || die "Failed to fix heimdal crypt library reference" - fi - - # Suhosin support - if [[ -n $SUHOSIN_VERSION ]] ; then - if use suhosin ; then - epatch "${WORKDIR}/${SUHOSIN_PATCH}" - fi - else - ewarn "Please note that this version of PHP does not yet come with a suhosin patch" - fi - - - # rebuild the whole autotools stuff as we are heavily patching it - # (suhosin, fastbuild, ...) - - # eaclocal doesn't accept --force, so we try to force re-generation - # this way - rm aclocal.m4 - - # work around divert() issues with newer autoconf, bug #281697 - if has_version '>=sys-devel/autoconf-2.64' ; then - sed -i -r \ - -e 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \ - $(grep -l divert $(find . -name '*.m4') configure.in) || die - fi - eautoreconf --force -W no-cross -} - -
--- a/dev-lang/php/files/eblits/src_test-v1.eblit Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,54 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_test-v1.eblit,v 1.3 2012/02/06 13:53:17 olemarkus Exp $ - -eblit-php-src_test() { - vecho ">>> Test phase [test]: ${CATEGORY}/${PF}" - PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" - if [[ ! -x "${PHP_BIN}" ]] ; then - ewarn "Test phase requires USE=cli, skipping" - return - else - export TEST_PHP_EXECUTABLE="${PHP_BIN}" - fi - - if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then - export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi" - fi - - - REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d "session.save_path=${T}" \ - "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}" - - for name in ${EXPECTED_TEST_FAILURES}; do - mv "${name}.out" "${name}.out.orig" 2>/dev/null - done - - local failed="$(find -name '*.out')" - if [[ ${failed} != "" ]] ; then - ewarn "The following test cases failed unexpectedly:" - for name in ${failed}; do - ewarn " ${name/.out/}" - done - else - einfo "No unexpected test failures, all fine" - fi - - if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then - local passed="" - for name in ${EXPECTED_TEST_FAILURES}; do - [[ -f "${name}.diff" ]] && continue - passed="${passed} ${name}" - done - if [[ ${passed} != "" ]] ; then - einfo "The following test cases passed unexpectedly:" - for name in ${passed}; do - ewarn " ${passed}" - done - else - einfo "None of the known-to-fail tests passed, all fine" - fi - fi -} - -
--- a/dev-lang/php/php-5.2.17.ebuild Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,389 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/Attic/php-5.2.17.ebuild,v 1.18 2012/01/21 09:49:56 olemarkus dead $ - -EAPI=2 - -PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob -interbase msql oci8 sapdb solid" - -inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool - -#SUHOSIN_VERSION="$PV-0.9.7" -SUHOSIN_VERSION="5.2.16-0.9.7" -EXPECTED_TEST_FAILURES="" - -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86" - -function php_get_uri () -{ - case "${1}" in - "php-pre") - echo "http://downloads.php.net/johannes/${2}" - ;; - "php") - echo "http://www.php.net/distributions/${2}" - ;; - "suhosin") - echo "http://download.suhosin.org/${2}" - ;; - "gentoo") - echo "mirror://gentoo/${2}" - ;; - *) - die "unhandled case in php_get_uri" - ;; - esac -} - -PHP_MV="$(get_major_version)" - -# alias, so we can handle different types of releases (finals, rcs, alphas, -# betas, ...) w/o changing the whole ebuild -PHP_PV="${PV/_rc/RC}" -PHP_RELEASE="php" -PHP_P="${PN}-${PHP_PV}" -PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" - -PHP_PATCHSET="0" -PHP_PATCHSET_URI=" - $(php_get_uri gentoo "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")" - -if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then - # in some cases we use our own suhosin patch (very recent version, - # patch conflicts, etc.) - SUHOSIN_TYPE="gentoo" -else - SUHOSIN_TYPE="suhosin" -fi - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch" - SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" -fi - -SRC_URI=" - ${PHP_SRC_URI} - ${PHP_PATCHSET_URI}" - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SRC_URI="${SRC_URI} - suhosin? ( ${SUHOSIN_URI} )" -fi - -DESCRIPTION="The PHP language runtime engine: CLI, CGI, Apache2 and embed SAPIs." -HOMEPAGE="http://php.net/" -LICENSE="PHP-3" - -# We can build the following SAPIs in the given order -SAPIS="cli cgi embed apache2" - -# Gentoo-specific, common features -IUSE="kolab" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads force-cgi-redirect discard-path" - -IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk - crypt +ctype curl curlwrappers db2 dbase dbmaker debug doc empress - empress-bcs esoob exif fdftk frontbase +filter firebird - flatfile ftp gd gd-external gdbm gmp +hash +iconv imap inifile - interbase iodbc ipv6 +json kerberos ldap ldap-sasl libedit - mhash msql mssql mysql mysqli ncurses nls oci8 - oci8-instant-client odbc pcntl +pcre pdo pic +posix postgres qdbm - readline recode reflection sapdb +session sharedext sharedmem - +simplexml snmp soap sockets solid spell spl sqlite ssl suhosin - sybase-ct sysvipc tidy +tokenizer truetype unicode wddx - xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" - -# Enable suhosin if available -[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" - -DEPEND=">=app-admin/eselect-php-0.6.2 - pcre? ( >=dev-libs/libpcre-7.9[unicode] ) - adabas? ( >=dev-db/unixODBC-1.8.13 ) - apache2? ( www-servers/apache[threads=] ) - berkdb? ( =sys-libs/db-4* ) - birdstep? ( >=dev-db/unixODBC-1.8.13 ) - bzip2? ( app-arch/bzip2 ) - cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) - cjk? ( !gd? ( !gd-external? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) ) - crypt? ( >=dev-libs/libmcrypt-2.4 ) - curl? ( >=net-misc/curl-7.10.5 ) - db2? ( >=dev-db/unixODBC-1.8.13 ) - dbmaker? ( >=dev-db/unixODBC-1.8.13 ) - empress? ( >=dev-db/unixODBC-1.8.13 ) - empress-bcs? ( >=dev-db/unixODBC-1.8.13 ) - esoob? ( >=dev-db/unixODBC-1.8.13 ) - exif? ( !gd? ( !gd-external? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) ) - fdftk? ( app-text/fdftk ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) - gd-external? ( media-libs/gd ) - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - gmp? ( >=dev-libs/gmp-4.1.2 ) - iconv? ( virtual/libiconv ) - imap? ( virtual/imap-c-client[ssl=] ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - kolab? ( >=net-libs/c-client-2004g-r1 ) - ldap? ( !oci8? ( >=net-nds/openldap-1.2.11 ) ) - ldap-sasl? ( !oci8? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - mhash? ( app-crypt/mhash ) - mssql? ( dev-db/freetds[mssql] ) - mysql? ( virtual/mysql ) - mysqli? ( >=virtual/mysql-4.1 ) - ncurses? ( sys-libs/ncurses ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient-basic ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql-base ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline ) - recode? ( app-text/recode ) - sapdb? ( >=dev-db/unixODBC-1.8.13 ) - sharedmem? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - solid? ( >=dev-db/unixODBC-1.8.13 ) - spell? ( >=app-text/aspell-0.50 ) - sqlite? ( =dev-db/sqlite-2* pdo? ( =dev-db/sqlite-3* ) ) - ssl? ( >=dev-libs/openssl-0.9.7 ) - sybase-ct? ( dev-db/freetds ) - tidy? ( app-text/htmltidy ) - truetype? ( - =media-libs/freetype-2* - >=media-libs/t1lib-5.0.0 - !gd? ( !gd-external? ( - virtual/jpeg media-libs/libpng sys-libs/zlib ) ) - ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( - x11-libs/libXpm - virtual/jpeg - media-libs/libpng sys-libs/zlib - ) - xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib ) - zlib? ( sys-libs/zlib ) - virtual/mta -" - -php="=${CATEGORY}/${PF}" -RDEPEND="${DEPEND} - truetype? ( || ( $php[gd] $php[gd-external] ) ) - cjk? ( || ( $php[gd] $php[gd-external] ) ) - exif? ( || ( $php[gd] $php[gd-external] ) ) - - xpm? ( $php[gd] ) - gd? ( $php[zlib,-gd-external] ) - gd-external? ( $php[-gd] ) - simplexml? ( $php[xml] ) - soap? ( $php[xml] ) - wddx? ( $php[xml] ) - xmlrpc? ( || ( $php[xml] $php[iconv] ) ) - xmlreader? ( $php[xml] ) - xsl? ( $php[xml] ) - ldap-sasl? ( $php[ldap,-oci8] ) - suhosin? ( $php[unicode] ) - adabas? ( $php[odbc] ) - birdstep? ( $php[odbc] ) - dbmaker? ( $php[odbc] ) - empress-bcs? ( $php[empress] ) - empress? ( $php[odbc] ) - esoob? ( $php[odbc] ) - db2? ( $php[odbc] ) - sapdb? ( $php[odbc] ) - solid? ( $php[odbc] ) - kolab? ( $php[imap] ) - - oci8? ( $php[-oci8-instant-client,-ldap-sasl] ) - oci8-instant-client? ( $php[-oci8] ) - - qdbm? ( $php[-gdbm] ) - readline? ( $php[-libedit] ) - recode? ( $php[-imap,-mysql,-mysqli] ) - firebird? ( $php[-interbase] ) - sharedmem? ( $php[-threads] ) - - !cli? ( !cgi? ( !apache2? ( !embed? ( $php[cli] ) ) ) ) - - filter? ( !dev-php${PHP_MV}/pecl-filter ) - json? ( !dev-php${PHP_MV}/pecl-json ) - zip? ( !dev-php${PHP_MV}/pecl-zip )" - -[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? ( $php[unicode] )" - -DEPEND="${DEPEND} - sys-devel/flex - >=sys-devel/m4-1.4.3 - >=sys-devel/libtool-1.5.18" - -# They are in PDEPEND because we need PHP installed first! -PDEPEND="doc? ( app-doc/php-docs )" - -SLOT="$(get_version_component_range 1-2)" -S="${WORKDIR}/${PHP_P}" - -# Allow users to install production version if they want to -# PHP 5.2 has other filenames for prod and dev versions - -case "${PHP_INI_VERSION}" in - production) - PHP_INI_UPSTREAM="php.ini-recommended" - ;; - development) - PHP_INI_UPSTREAM="php.ini-dist" - ;; - *) - PHP_INI_VERSION="development" - PHP_INI_UPSTREAM="php.ini-dist" - ;; -esac - -PHP_INI_FILE="php.ini" - -want_apache - -# eblit-core -# Usage: <function> [version] [eval] -# Main eblit engine -eblit-core() { - [[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files" - local e v func=$1 ver=$2 eval_=$3 - for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do - e="${FILESDIR}/eblits/${func}${v}.eblit" - if [[ -e ${e} ]] ; then - . "${e}" - [[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }" - return 0 - fi - done - return 1 -} - -# eblit-include -# Usage: [--skip] <function> [version] -# Includes an "eblit" -- a chunk of common code among ebuilds in a given -# package so that its functions can be sourced and utilized within the -# ebuild. -eblit-include() { - local skipable=false r=0 - [[ $1 == "--skip" ]] && skipable=true && shift - [[ $1 == pkg_* ]] && skipable=true - - [[ -z $1 ]] && die "Usage: eblit-include <function> [version]" - eblit-core $1 $2 - r="$?" - ${skipable} && return 0 - [[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/" -} - -# eblit-run-maybe -# Usage: <function> -# Runs a function if it is defined in an eblit -eblit-run-maybe() { - [[ $(type -t "$@") == "function" ]] && "$@" -} - -# eblit-run -# Usage: <function> [version] -# Runs a function defined in an eblit -eblit-run() { - eblit-include --skip common "v2" - eblit-include "$@" - eblit-run-maybe eblit-$1-pre - eblit-${PN}-$1 - eblit-run-maybe eblit-$1-post -} - -# eblit-pkg -# Usage: <phase> [version] -# Includes the given functions AND evals them so they're included in the binpkgs -eblit-pkg() { - [[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]" - eblit-core $1 $2 1 -} - -eblit-pkg pkg_setup v2 - -src_prepare() { eblit-run src_prepare v2 ; } -src_configure() { eblit-run src_configure v521 ; } -src_compile() { eblit-run src_compile v1 ; } -src_install() { eblit-run src_install v2 ; } -src_test() { eblit-run src_test v1 ; } - -#Do not use eblit for this because it will not get sourced when installing from -#binary package (bug #380845) -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - APACHE2_MOD_DEFINE="PHP5" - APACHE2_MOD_CONF="70_mod_php5" - apache-module_pkg_postinst - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order" - elog "to compile extensions for the ${SLOT} ABI" - elog - if ! use readline && use cli ; then - ewarn "Note that in order to use php interactivly, you need to enable" - ewarn "the readline USE flag or php -a will hang" - fi - elog - elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." - elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" - elog "'production' or 'development' in /etc/make.conf" - ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}" - - # check for not yet migrated old style config dirs - ls "${ROOT}"/etc/php/*-php5 &>/dev/null - if [[ $? -eq 0 ]]; then - ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" - ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" - fi - elog - elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" - elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" - elog - - if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then - ewarn "The suhosin USE flag now only installs the suhosin patch!" - ewarn "If you want the suhosin extension, make sure you install" - ewarn " dev-php/suhosin" - ewarn - fi -}
--- a/mail-filter/spambayes/Manifest Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -DIST spambayes-1.0.4.tar.gz 697781 RMD160 6dfbaa5cc7eb14d9ddbb68c381580e793cb9c28e SHA1 a7b92eb8465a6ac093d29e64c539ff8348b08c26 SHA256 53c498d98e2f0a88d6edb928e3e1abcf65fc4aee8a98e142175809b9409d30aa -EBUILD spambayes-1.0.4.ebuild 1185 RMD160 c76faeca416fcf186170c1915aab4e284d1afade SHA1 54189565f5a125149516f3f442c5f289b42ef086 SHA256 1afc17bef3bb06791632a2b448d3b0e5ab64c63e39ff0404c33e217b1f1f312f
--- a/mail-filter/spambayes/spambayes-1.0.4.ebuild Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/spambayes/spambayes-1.0.4.ebuild,v 1.0 2005/04/08 22:22:43 userwaldo Exp $ - -inherit distutils - -DESCRIPTION="An anti-spam filter using on Bayesian filtering" -HOMEPAGE="http://spambayes.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -RESTRICT="nomirror" - -LICENSE="PSF-2.2" -SLOT="0" -KEYWORDS="~x86 ~ppc ~amd64" -IUSE="" - -DEPEND=">=dev-lang/python-2.2.2" - -src_install() { - distutils_src_install - dodoc *.txt || die "doc *.txt files failed" - # someone might have benefits of the other documetation too, - # therefore added. - docinto contrib || die "doc directory, contrib, fail" - dodoc contrib/* || die "doc contrib/* failed" - docinto utilities || die "doc directory, utilities, failed" - dodoc utilities/* || die "doc utilities/* failed" - docinto testtools || die "doc directory, testtools, failed" - dodoc testtools/* || die "doc testtools/* failed" - - exeinto /etc/init.d - newexe ${FILESDIR}/spambayespop3proxy.rc spambayespop3proxy - - insinto /etc - doins ${FILESDIR}/bayescustomize.ini - - keepdir /var/lib/spambayes - -} -
--- a/net-dialup/pptpclient/Manifest Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -AUX pptp_fe.pl 8100 RMD160 4b8c4591645a5f79daf2ba27e3e657db24323ffe SHA1 ec6102be37a7a2107f796bee974feadb7a3bd7a1 SHA256 f980fd3ff529bd4476852be39e05579bbeb9dc5c299795050a8d146ed6c4c648 -AUX pptpclient-1.7.2-aliasing.patch 6769 RMD160 6c264de3c0b17386e1e04e25001bc3030cadaac0 SHA1 9df2220cf79aa38578897fbc3eedd180882964f7 SHA256 88c4e95728878e83cdce677e7db7f983650ff1e0c297dc6a893fe603e0c76306 -AUX pptpclient-1.7.2-const.patch 2117 RMD160 2f518665aec91f5c9b2f6b4c65d6dd39a66deda1 SHA1 5604f4bdba30555d09348c52932a95878655cfa8 SHA256 750005ee3cd0e004802394cf41708d501e01e5472b744d51ab0e249d3f9e949a -AUX pptpclient-1.7.2-field-init.patch 497 RMD160 8f79a324b822199fdd84f3a21ede7bb574c8425c SHA1 06666d73ab7abeeafede744925020cb37841e085 SHA256 140f9903f423404a285022ee1831d962831146864156580e63c84f6769951e65 -AUX pptpclient-1.7.2-ip-path.patch 883 RMD160 6c89e92f99e72c88bb3ac09422d0b60cef67ff74 SHA1 cda0eb529094b732f7def6cfe8cde7af23d21b6c SHA256 e4b30e07b7af6f0085044a98644d7d57689a74f2302f7b5a8a9108a7613179d6 -AUX pptpclient-1.7.2-nested-externs.patch 780 RMD160 e9b8c59158819540f011af248e600ea968d61568 SHA1 b35e6946971a2c79acd153d424f61ed3e4933e28 SHA256 c3e7a2bff092c7431c8a7016efd6a4f0545eaa62849d515a747f011602c4d83c -AUX pptpclient-1.7.2-process-name.patch 1242 RMD160 fd10fc6506eb1e6ad2fdd1fc46dfb453d4623ec7 SHA1 b2edbe1f7ad781171142809bc48b6db05f0295ce SHA256 a16bc434f301af72f43cca41a17e8232006878295b0f4f2a3fc5dbe85b020b5e -AUX pptpclient-1.7.2-prototype.patch 7270 RMD160 8aa8cc30791877d4e99ba60a806c4ba63e02673f SHA1 d55911bdb43d5f0f50171f8bf5fb6a10e92fab89 SHA256 a4a8be3c4df696f09eb37e98bc9838ce0014d14e5ec5b35b02a7d426276c4293 -AUX pptpclient-1.7.2-sign-compare.patch 6223 RMD160 267f362d3d9aa0198b81f419a768a25d4fa59dca SHA1 a0d7c043e4a3def2a6c555b34c34e7be0a0c00c9 SHA256 a62ff93b9b7c022f33e5bc93c70ea54151d2c79f80eb0aa2673c2ed31b5d03ff -AUX pptpclient-1.7.2-unused.patch 2860 RMD160 8898f7fbb89845b45da2fa7a3a768ea174296bb2 SHA1 c7a1a107b212ff82675aade267e81e734e9afbbe SHA256 9234525f4c6d52e8432d4e802841bb83e7e8d738792ee8187c494e6ef8d8ab6c -DIST pptp-1.7.2.tar.gz 81113 RMD160 fff47ef2c3546b06c69c27db01beebed7e6cda4b SHA1 1007eb1d4d21629fab390903e8b394d6157b4983 SHA256 e98ae0065d2a39fa3131654ff28cb7070e996f668ed6d0e7d9a445b8d37694bc -DIST pptp-command-20050401.gz 7662 RMD160 1c02ad63aa90419bbe2151476d1463d7a26d6215 SHA1 546c437896ba00fe2b66b924671de884986de5d8 SHA256 49cfb115491b476a364ddc03f8c1b27f7ba19b6a231eabc11e823e3f32c5987d -EBUILD pptpclient-1.7.2-r3.ebuild 1701 RMD160 4fe3219653279c8b711fd602c455bc6b1697a77d SHA1 e7ad662d596babe1f093cb0a0863728f29c3aa97 SHA256 86b90f3648b11e3c7a64973f57e1e43357ee3a04cba285ee6801ae52c3312886
--- a/net-dialup/pptpclient/files/pptp_fe.pl Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,370 +0,0 @@ -#!/usr/bin/perl -# -# $Id: pptp_fe.pl,v 1.1 2003/02/26 23:31:46 agriffis Exp $ -# -# pptp_fe.pl, privileged portion of xpptp_fe.pl -# Copyright (C) 2001 Smoot Carl-Mitchell (smoot@tic.com) -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# - -use strict; -use Getopt::Std; -use Time::localtime; -use IO::Handle; - -my $Usage = "usage: pptp_fe [-c config_file] [-d] [-h] [-k] [-n network] - [-p] [-r routes] [-t timeout] [host] - where: - -c - configuration file (default is ~/.pptp_fe.conf) - -d - pppd debug flag - -h - this help message - -k - kill pppd daemon with route to network - -n - network number of remote private network in x.x.x.x/n notation - -r - routes to add to routing table separated by commas - -p - suppress prompting - -t - connection timeout retry interval in seconds (default 60 seconds) - host - remote PPTP server name -"; - -my %Opt; -getopts("c:dhkn:pr:t:", \%Opt); - -my $Config_File = $Opt{'c'}; -$Config_File = "$ENV{'HOME'}/.pptp_fe.conf" unless $Opt{'c'}; -my $Config; -my $Debug = $Opt{'d'}; -$Debug = 0 unless $Debug; -my $Debug_Flag = "debug" if $Debug; -my $Help = $Opt{'h'}; -my $Kill = $Opt{'k'}; -my $Net = $Opt{'n'}; -my $No_Prompt = $Opt{'p'}; -my $Route = $Opt{'r'}; -my $Timeout = $Opt{'t'}; $Timeout = 60 unless $Timeout; - -print($Usage), exit(1) if $Help; - -my $Server = $ARGV[0]; - -my $State = "disconnected"; - -system("modprobe ppp-compress-18"); - -$Config = cmd_read_config_file($Config_File); -for my $cmd (@$Config) { - cmd_set($cmd, 1); -} - -print "($State) > " unless $No_Prompt; -STDOUT->flush; -for (;;) { - my $rin = ''; - my $rout = ''; - vec($rin, fileno(STDIN), 1) = 1; - command() if select($rout=$rin, undef, undef, 5); - - my $interface = ""; - if ($State eq "connected" && ! ($interface = net_interface_up($Net))) { - print "\n"; - print "interface $interface for $Net not up - restarting\n"; - cmd_connect(); - print "($State) > " unless $No_Prompt;; - } -} - -sub command { - - my $input; - sysread(STDIN, $input, 1024); - - for my $line1 (split("\n", $input)) { - my $line = $line1; - $line =~ s/\s*$//; - $line =~ s/^\s*//; - my ($command, $arguments) = split(" ", $line, 2); - - if ($command eq "c") { - cmd_connect(); - } - elsif ($command eq "d") { - cmd_disconnect(); - } - elsif ($command eq "h") { - cmd_help(); - } - elsif ($command eq "l") { - cmd_list(); - } - elsif ($command eq "q") { - cmd_disconnect(); - exit 0; - } - elsif ($command eq "r") { - $Config = cmd_read_config_file($arguments); - } - elsif ($command eq "s") { - cmd_set($arguments, 0); - } - elsif ($command eq "w") { - cmd_write_config_file($arguments); - } - elsif ($command ne "") { - print "unknown command\n"; - } - } - print "($State) > " unless $No_Prompt; - STDOUT->flush; -} - -sub cmd_connect { - - cmd_disconnect() if $State eq "connected"; - - my $start_time = time(); - my $date_string = ctime($start_time); - print "$date_string Running pptp $Server $Debug_Flag"; - system("pptp $Server $Debug_Flag"); - - my $interface = ""; - - do { - sleep 1; - $interface = net_interface_up($Net); - print "."; - } until ($interface || time() > $start_time + $Timeout); - - if (time() > $start_time + $Timeout) { - print "timed out after $Timeout sec\n"; - $State = "disconnected"; - return 0; - } - - print "\n"; - - my $ifcfg = `ifconfig $interface`; - $ifcfg =~ /P-t-P:(.*) Mask/; - my $ip = $1; - print "setting route to network $Net to interface $interface\n"; - system("route add -net $Net dev $interface metric 2"); - - # Routes are separated by commas - my @route = split(/,/, $Route); - for my $route (@route) { - my $net_flag = ""; - $net_flag = "-net" if $route =~ /\//; - - print "setting route to $route to interface $interface\n"; - system("route add $net_flag $route dev $interface"); - } - - $State = "connected"; - print "connected\n"; - return 1; -} - -sub cmd_disconnect { - - return 1 if $State eq "disconnected"; - - my $interface = net_interface_up($Net); - my $pid_file = "/var/run/$interface.pid"; - - # delete the named pipes - XXX this is a bit crude - system("rm -f /var/run/pptp/*"); - - $State = "disconnected", return 1 unless $interface && -f $pid_file; - - my $pid = `cat $pid_file`; - chomp $pid; - print "killing pppd($pid)\n"; - kill("HUP", $pid); - print "waiting for pppd to die"; - do { - sleep 1; - print "."; - } - until (kill(0, $pid)); - - print "\n"; - $State = "disconnected"; - print "disconnected\n"; - return 1; -} - -sub cmd_list { - - print "Server = $Server\n"; - print "Network = $Net\n"; - print "Routes = $Route\n"; - print "Debug = $Debug_Flag\n"; - print "No_Prompt = $No_Prompt\n"; - print "Timeout = $Timeout\n"; - print "\n"; -} - -sub cmd_help { - - print "Commands are:\n"; - print "c - initiate PPTP connection\n"; - print "d - disconnect PPTP\n"; - print "h - this help message\n"; - print "l - list current configuration\n"; - print "q - quite the program\n"; - print "r - read configuration file\n"; - print "s - set configuration variable (l for a list)\n"; - print "w - write the configuration file\n"; - -} - -sub cmd_set { - my $input = shift; - my $no_replace = shift; - - my ($variable, $value) = split(/\s*=\s*/, $input); - - $variable = "\L$variable"; - if (! $variable) { - print "syntax: s variable = value\n"; - return 0; - } - - if ($variable eq "server") { - $Server = $value unless $no_replace && $Server; - } - elsif ($variable eq "network") { - $Net = $value unless $no_replace && $Net; - } - elsif ($variable eq "routes") { - $Route = $value unless $no_replace && $Route; - } - elsif ($variable eq "debug") { - $Debug_Flag = $value unless $no_replace && $Debug_Flag; - } - elsif ($variable eq "no_prompt") { - $No_Prompt = $value unless $no_replace && $No_Prompt; - } - elsif ($variable eq "timeout") { - $Timeout = $value unless $no_replace && $Timeout; - } - elsif ($variable eq "config_file") { - $Config_File = $value unless $no_replace && $Config_File; - } - else { - print "unknown variable\n"; - } -} - -sub cmd_read_config_file { - my $file = shift; - - my $config = []; - $file = $Config_File unless $file; - local *IN; - if (!open(IN, $file)) { - print "cannot open $file\n"; - return $config; - } - - my @config_file = <IN>; - close IN; - push @config_file, "\n"; - chomp @config_file; - - for my $line (@config_file) { - next if /\s*#/; - - if ($line =~ /\S/) { - $line =~ s/^\s*//; - $line =~ s/\s*$//; - push @$config, $line; - next; - } - } - return $config; -} - -sub cmd_write_config_file { - my $file = shift; - - $file = $Config_File unless $file; - local *OUT; - if (!open(OUT, ">$file")) { - print "cannot open $file\n"; - return 0; - } - - my $oldfh = select OUT; - cmd_list(); - close OUT; - select $oldfh; - - return 1; -} - -sub net_interface_up { - my $cidr = shift; - - # cidr is net/bits - my($net, $nbits) = split(/\//, $cidr); - - # compute the network number - my $netnum = netnum($net, $nbits); - local(*INTERFACE); - open(INTERFACE, "ifconfig|") || die "cannot run ifconfig - $!\n"; - - my $interface = ""; - my @interface = <INTERFACE>; - close INTERFACE; - for (@interface) { - chomp; - - # new interface - if (/^[a-zA-Z]/) { - if ($interface =~ /(.*) Link.*P-t-P:(.*) Mask/) { - my $interface_name = $1; - my $ip = $2; - return $interface_name - if netnum($ip, $nbits) == $netnum; - } - $interface = ""; - } - $interface .= $_; - } - return ""; -} - -sub netnum { - my $net = shift; - my $bits = shift; - - my @octets = split(/\./, $net); - my $netnum = 0; - for my $octet (@octets) { - $netnum <<= 8; - $netnum |= $octet; - } - - my $mask = 0; - for (1..$bits) { - $mask <<= 1; - $mask |= 1; - } - $mask = $mask << (32-$bits); - - $netnum &= $mask; - - return $netnum; -}
--- a/net-dialup/pptpclient/files/pptpclient-1.7.2-aliasing.patch Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,172 +0,0 @@ -diff -up pptp-1.7.2/pptp.c.alias pptp-1.7.2/pptp.c ---- pptp-1.7.2/pptp.c.alias 2011-12-06 22:24:06.617318769 +0000 -+++ pptp-1.7.2/pptp.c 2011-12-06 22:36:25.761692858 +0000 -@@ -463,7 +463,10 @@ int open_callmgr(struct in_addr inetaddr - char **envp, int pty_fd, int gre_fd) - { - /* Try to open unix domain socket to call manager. */ -- struct sockaddr_un where; -+ union { -+ struct sockaddr a; -+ struct sockaddr_un u; -+ } where; - const int NUM_TRIES = 3; - int i, fd; - pid_t pid; -@@ -473,12 +476,12 @@ int open_callmgr(struct in_addr inetaddr - fatal("Could not create unix domain socket: %s", strerror(errno)); - } - /* Make address */ -- callmgr_name_unixsock(&where, inetaddr, localbind); -+ callmgr_name_unixsock(&where.u, inetaddr, localbind); - for (i = 0; i < NUM_TRIES; i++) { -- if (connect(fd, (struct sockaddr *) &where, sizeof(where)) < 0) { -+ if (connect(fd, &where.a, sizeof(where.u)) < 0) { - /* couldn't connect. We'll have to launch this guy. */ - -- unlink (where.sun_path); -+ unlink (where.u.sun_path); - - /* fork and launch call manager process */ - switch (pid = fork()) { -diff -up pptp-1.7.2/pptp_callmgr.c.alias pptp-1.7.2/pptp_callmgr.c ---- pptp-1.7.2/pptp_callmgr.c.alias 2011-12-06 22:24:06.617318769 +0000 -+++ pptp-1.7.2/pptp_callmgr.c 2011-12-06 22:34:46.142647941 +0000 -@@ -196,14 +196,17 @@ int callmgr_main(int argc, char **argv, - /* Step 5b: Handle new connection to UNIX socket */ - if (FD_ISSET(unix_sock, &read_set)) { - /* New call! */ -- struct sockaddr_un from; -- socklen_t len = sizeof(from); -+ union { -+ struct sockaddr a; -+ struct sockaddr_un u; -+ } from; -+ socklen_t len = sizeof(from.u); - PPTP_CALL * call; - struct local_callinfo *lci; - int s; - /* Accept the socket */ - FD_CLR (unix_sock, &read_set); -- if ((s = accept(unix_sock, (struct sockaddr *) &from, &len)) < 0) { -+ if ((s = accept(unix_sock, &from.a, &len)) < 0) { - warn("Socket not accepted: %s", strerror(errno)); - goto skip_accept; - } -@@ -313,11 +316,14 @@ cleanup: - /*** open_inetsock ************************************************************/ - int open_inetsock(struct in_addr inetaddr) - { -- struct sockaddr_in dest, src; -+ union { -+ struct sockaddr a; -+ struct sockaddr_in i; -+ } dest, src; - int s; -- dest.sin_family = AF_INET; -- dest.sin_port = htons(PPTP_PORT); -- dest.sin_addr = inetaddr; -+ dest.i.sin_family = AF_INET; -+ dest.i.sin_port = htons(PPTP_PORT); -+ dest.i.sin_addr = inetaddr; - if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) { - warn("socket: %s", strerror(errno)); - return s; -@@ -332,14 +338,14 @@ int open_inetsock(struct in_addr inetadd - #endif - if (localbind.s_addr != INADDR_NONE) { - bzero(&src, sizeof(src)); -- src.sin_family = AF_INET; -- src.sin_addr = localbind; -- if (bind(s, (struct sockaddr *) &src, sizeof(src)) != 0) { -+ src.i.sin_family = AF_INET; -+ src.i.sin_addr = localbind; -+ if (bind(s, &src.a, sizeof(src.i)) != 0) { - warn("bind: %s", strerror(errno)); - close(s); return -1; - } - } -- if (connect(s, (struct sockaddr *) &dest, sizeof(dest)) < 0) { -+ if (connect(s, &dest.a, sizeof(dest.i)) < 0) { - warn("connect: %s", strerror(errno)); - close(s); return -1; - } -@@ -349,7 +355,10 @@ int open_inetsock(struct in_addr inetadd - /*** open_unixsock ************************************************************/ - int open_unixsock(struct in_addr inetaddr) - { -- struct sockaddr_un where; -+ union { -+ struct sockaddr a; -+ struct sockaddr_un u; -+ } where; - struct stat st; - char *dir; - int s; -@@ -357,21 +366,21 @@ int open_unixsock(struct in_addr inetadd - warn("socket: %s", strerror(errno)); - return s; - } -- callmgr_name_unixsock( &where, inetaddr, localbind); -- if (stat(where.sun_path, &st) >= 0) { -+ callmgr_name_unixsock( &where.u, inetaddr, localbind); -+ if (stat(where.u.sun_path, &st) >= 0) { - warn("Call manager for %s is already running.", inet_ntoa(inetaddr)); - close(s); return -1; - } - /* Make sure path is valid. */ -- dir = dirname(where.sun_path); -+ dir = dirname(where.u.sun_path); - if (!make_valid_path(dir, 0770)) -- fatal("Could not make path to %s: %s", where.sun_path, strerror(errno)); -+ fatal("Could not make path to %s: %s", where.u.sun_path, strerror(errno)); - free(dir); -- if (bind(s, (struct sockaddr *) &where, sizeof(where)) < 0) { -+ if (bind(s, &where.a, sizeof(where.u)) < 0) { - warn("bind: %s", strerror(errno)); - close(s); return -1; - } -- chmod(where.sun_path, 0777); -+ chmod(where.u.sun_path, 0777); - listen(s, 127); - return s; - } -diff -up pptp-1.7.2/pptp_gre.c.alias pptp-1.7.2/pptp_gre.c ---- pptp-1.7.2/pptp_gre.c.alias 2011-12-06 22:24:06.627318773 +0000 -+++ pptp-1.7.2/pptp_gre.c 2011-12-06 22:24:06.629318775 +0000 -@@ -85,7 +85,10 @@ uint64_t time_now_usecs(void) - /*** Open IP protocol socket **************************************************/ - int pptp_gre_bind(struct in_addr inetaddr) - { -- struct sockaddr_in src_addr, loc_addr; -+ union { -+ struct sockaddr a; -+ struct sockaddr_in i; -+ } loc_addr, src_addr; - int s = socket(AF_INET, SOCK_RAW, PPTP_PROTO); - if (s < 0) { warn("socket: %s", strerror(errno)); return -1; } - #ifdef SO_MARK -@@ -98,16 +101,16 @@ int pptp_gre_bind(struct in_addr inetadd - #endif - if (localbind.s_addr != INADDR_NONE) { - bzero(&loc_addr, sizeof(loc_addr)); -- loc_addr.sin_family = AF_INET; -- loc_addr.sin_addr = localbind; -- if (bind(s, (struct sockaddr *) &loc_addr, sizeof(loc_addr)) != 0) { -+ loc_addr.i.sin_family = AF_INET; -+ loc_addr.i.sin_addr = localbind; -+ if (bind(s, &loc_addr.a, sizeof(loc_addr.i)) != 0) { - warn("bind: %s", strerror(errno)); close(s); return -1; - } - } -- src_addr.sin_family = AF_INET; -- src_addr.sin_addr = inetaddr; -- src_addr.sin_port = 0; -- if (connect(s, (struct sockaddr *) &src_addr, sizeof(src_addr)) < 0) { -+ src_addr.i.sin_family = AF_INET; -+ src_addr.i.sin_addr = inetaddr; -+ src_addr.i.sin_port = 0; -+ if (connect(s, &src_addr.a, sizeof(src_addr.i)) < 0) { - warn("connect: %s", strerror(errno)); close(s); return -1; - } - my = test_redirections();
--- a/net-dialup/pptpclient/files/pptpclient-1.7.2-const.patch Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,52 +0,0 @@ -diff -up pptp-1.7.2/pptp.c.const pptp-1.7.2/pptp.c ---- pptp-1.7.2/pptp.c.const 2011-11-30 18:58:39.713148113 +0000 -+++ pptp-1.7.2/pptp.c 2011-12-01 09:23:29.716446618 +0000 -@@ -565,10 +565,13 @@ int get_call_id(int sock, pid_t gre, pid - void launch_pppd(char *ttydev, int argc, char **argv) - { - char *new_argv[argc + 4];/* XXX if not using GCC, hard code a limit here. */ -+ char str_pppd[] = PPPD_BINARY; -+ char str_direct[] = "-direct"; -+ char str_38400[] = "38400"; - int i = 0, j; -- new_argv[i++] = PPPD_BINARY; -+ new_argv[i++] = str_pppd; - #ifdef USER_PPP -- new_argv[i++] = "-direct"; -+ new_argv[i++] = str_direct; - /* ppp expects to have stdin connected to ttydev */ - if ((j = open(ttydev, O_RDWR)) == -1) - fatal("Cannot open %s: %s", ttydev, strerror(errno)); -@@ -577,7 +580,7 @@ void launch_pppd(char *ttydev, int argc, - close(j); - #else - new_argv[i++] = ttydev; -- new_argv[i++] = "38400"; -+ new_argv[i++] = str_38400; - #endif - for (j = 0; j < argc; j++) - new_argv[i++] = argv[j]; -diff -up pptp-1.7.2/util.c.const pptp-1.7.2/util.c ---- pptp-1.7.2/util.c.const 2008-05-14 07:33:55.000000000 +0100 -+++ pptp-1.7.2/util.c 2011-11-30 18:58:39.719148114 +0000 -@@ -16,7 +16,7 @@ - #endif - - /* implementation of log_string, defined as extern in util.h */ --char *log_string = "anon"; -+const char *log_string = "anon"; - - static void open_log(void) __attribute__ ((constructor)); - static void close_log(void) __attribute__ ((destructor)); -diff -up pptp-1.7.2/util.h.const pptp-1.7.2/util.h ---- pptp-1.7.2/util.h.const 2008-05-14 07:33:55.000000000 +0100 -+++ pptp-1.7.2/util.h 2011-11-30 18:59:47.458171318 +0000 -@@ -10,7 +10,7 @@ - /* log_string is an identifier for this pptp process, passed from - command line using --log-string=X, and included with every log message. - Useful for people with multiple pptp sessions open at a time */ --extern char * log_string; -+extern const char * log_string; - - /* log_level sets the logging verbosity. Values range from 0 (errors only) - to 1 (errors and warnings) to 2 (high verbosity, for debugging) */
--- a/net-dialup/pptpclient/files/pptpclient-1.7.2-field-init.patch Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ ---- pptp-1.7.2/orckit_quirks.c.field 2008-05-14 07:33:55.000000000 +0100 -+++ pptp-1.7.2/orckit_quirks.c 2011-12-01 09:31:04.762035792 +0000 -@@ -62,7 +62,7 @@ int - orckit_atur3_start_ctrl_conn_hook(struct pptp_start_ctrl_conn* packet) - { - struct pptp_start_ctrl_conn fixed_packet = { -- {0}, /* we'll set the header later */ -+ {0, 0, 0, 0, 0}, /* we'll set the header later */ - hton16(PPTP_VERSION), 0, 0, - hton32(PPTP_FRAME_ASYNC), hton32(PPTP_BEARER_ANALOG), - hton16(0) /* max channels */,
--- a/net-dialup/pptpclient/files/pptpclient-1.7.2-ip-path.patch Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -diff -Nru pptp-1.7.2.orig/routing.c pptp-1.7.2/routing.c ---- pptp-1.7.2.orig/routing.c 2008-05-14 08:33:55.000000000 +0200 -+++ pptp-1.7.2/routing.c 2009-09-16 23:28:11.000000000 +0200 -@@ -55,7 +55,7 @@ - - void routing_init(char *ip) { - char buf[256]; -- snprintf(buf, 255, "/bin/ip route get %s", ip); -+ snprintf(buf, 255, "/sbin/ip route get %s", ip); - FILE *p = popen(buf, "r"); - fgets(buf, 255, p); - /* TODO: check for failure of fgets */ -@@ -66,14 +66,14 @@ - - void routing_start() { - char buf[256]; -- snprintf(buf, 255, "/bin/ip route replace %s", route); -+ snprintf(buf, 255, "/sbin/ip route replace %s", route); - FILE *p = popen(buf, "r"); - pclose(p); - } - - void routing_end() { - char buf[256]; -- snprintf(buf, 255, "/bin/ip route delete %s", route); -+ snprintf(buf, 255, "/sbin/ip route delete %s", route); - FILE *p = popen(buf, "r"); - pclose(p); - }
--- a/net-dialup/pptpclient/files/pptpclient-1.7.2-nested-externs.patch Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -diff -up pptp-1.7.2/pptp_gre.c.nested pptp-1.7.2/pptp_gre.c ---- pptp-1.7.2/pptp_gre.c.nested 2011-12-06 16:45:34.605691678 +0000 -+++ pptp-1.7.2/pptp_gre.c 2011-12-06 19:07:14.169449813 +0000 -@@ -23,6 +23,10 @@ - #include "pqueue.h" - #include "test.h" - -+/* globals from pptp.c */ -+extern struct in_addr localbind; -+extern int rtmark; -+ - #define PACKET_MAX 8196 - /* test for a 32 bit counter overflow */ - #define WRAPPED( curseq, lastseq) \ -@@ -82,7 +86,6 @@ uint64_t time_now_usecs(void) - int pptp_gre_bind(struct in_addr inetaddr) - { - struct sockaddr_in src_addr, loc_addr; -- extern struct in_addr localbind; - int s = socket(AF_INET, SOCK_RAW, PPTP_PROTO); - if (s < 0) { warn("socket: %s", strerror(errno)); return -1; } - if (localbind.s_addr != INADDR_NONE) {
--- a/net-dialup/pptpclient/files/pptpclient-1.7.2-process-name.patch Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ -diff -Nru pptp-1.7.2.orig/pptp.c pptp-1.7.2/pptp.c ---- pptp-1.7.2.orig/pptp.c 2008-05-14 08:33:55.000000000 +0200 -+++ pptp-1.7.2/pptp.c 2009-06-20 10:53:07.000000000 +0200 -@@ -59,11 +59,7 @@ - #include "pptp_callmgr.h" - #include "pptp_gre.h" - #include "version.h" --#if defined(__linux__) --#include <sys/prctl.h> --#else - #include "inststr.h" --#endif - #include "util.h" - #include "pptp_quirks.h" - #include "pqueue.h" -@@ -394,12 +390,7 @@ - char *tty_name = ttyname(tty_fd); - snprintf(buf, sizeof(buf), "pptp: GRE-to-PPP gateway on %s", - tty_name ? tty_name : "(null)"); --#ifdef PR_SET_NAME -- rc = prctl(PR_SET_NAME, "pptpgw", 0, 0, 0); -- if (rc != 0) perror("prctl"); --#else - inststr(argc, argv, envp, buf); --#endif - if (sigsetjmp(env, 1)!= 0) goto shutdown; - - signal(SIGINT, sighandler); -@@ -495,13 +486,7 @@ - char *my_argv[3] = { argv[0], inet_ntoa(inetaddr), phonenr }; - char buf[128]; - snprintf(buf, sizeof(buf), "pptp: call manager for %s", my_argv[1]); --#ifdef PR_SET_NAME -- int rc; -- rc = prctl(PR_SET_NAME, "pptpcm", 0, 0, 0); -- if (rc != 0) perror("prctl"); --#else - inststr(argc, argv, envp, buf); --#endif - exit(callmgr_main(3, my_argv, envp)); - } -
--- a/net-dialup/pptpclient/files/pptpclient-1.7.2-prototype.patch Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,218 +0,0 @@ -diff -up pptp-1.7.2/pptp_ctrl.c.prototype pptp-1.7.2/pptp_ctrl.c ---- pptp-1.7.2/pptp_ctrl.c.prototype 2011-12-06 16:41:47.391574067 +0000 -+++ pptp-1.7.2/pptp_ctrl.c 2011-12-06 16:41:47.405574074 +0000 -@@ -174,7 +174,7 @@ int max_echo_wait = PPTP_TIMEOUT; - - /* Local prototypes */ - static void pptp_reset_timer(void); --static void pptp_handle_timer(); -+static void pptp_handle_timer(void); - /* Write/read as much as we can without blocking. */ - int pptp_write_some(PPTP_CONN * conn); - int pptp_read_some(PPTP_CONN * conn); -@@ -1059,7 +1059,7 @@ static void pptp_reset_timer(void) - - - /*** Handle keep-alive timer **************************************************/ --static void pptp_handle_timer() -+static void pptp_handle_timer(void) - { - int i; - /* "Keep Alives and Timers, 1": check connection state */ -diff -up pptp-1.7.2/pptp_gre.c.prototype pptp-1.7.2/pptp_gre.c ---- pptp-1.7.2/pptp_gre.c.prototype 2011-12-06 16:41:47.392574067 +0000 -+++ pptp-1.7.2/pptp_gre.c 2011-12-06 16:45:34.605691678 +0000 -@@ -71,7 +71,7 @@ void print_packet(int fd, void *pack, un - #endif - - /*** time_now_usecs ***********************************************************/ --uint64_t time_now_usecs() -+uint64_t time_now_usecs(void) - { - struct timeval tv; - gettimeofday(&tv, NULL); -diff -up pptp-1.7.2/pptp_quirks.c.prototype pptp-1.7.2/pptp_quirks.c ---- pptp-1.7.2/pptp_quirks.c.prototype 2008-05-14 07:33:55.000000000 +0100 -+++ pptp-1.7.2/pptp_quirks.c 2011-12-06 16:41:47.405574074 +0000 -@@ -30,7 +30,7 @@ int set_quirk_index(int index) - return -1; - } - --int get_quirk_index() -+int get_quirk_index(void) - { - return quirk_index; - } -diff -up pptp-1.7.2/pptp_quirks.h.prototype pptp-1.7.2/pptp_quirks.h ---- pptp-1.7.2/pptp_quirks.h.prototype 2008-05-14 07:33:55.000000000 +0100 -+++ pptp-1.7.2/pptp_quirks.h 2011-12-06 16:41:47.406574074 +0000 -@@ -53,7 +53,7 @@ int set_quirk_index(int index); - - /* get the global quirk index. return the index on success, - -1 if no quirk is defined */ --int get_quirk_index(); -+int get_quirk_index(void); - - - #endif /* INC_PPTP_QUIRKS_H */ -diff -up pptp-1.7.2/pqueue.c.prototype pptp-1.7.2/pqueue.c ---- pptp-1.7.2/pqueue.c.prototype 2011-12-06 16:41:47.392574067 +0000 -+++ pptp-1.7.2/pqueue.c 2011-12-06 16:41:47.406574074 +0000 -@@ -217,7 +217,7 @@ int pqueue_del (pqueue_t *point) { - - - --pqueue_t *pqueue_head () { -+pqueue_t *pqueue_head (void) { - return pq_head; - } - -diff -up pptp-1.7.2/pqueue.h.prototype pptp-1.7.2/pqueue.h ---- pptp-1.7.2/pqueue.h.prototype 2011-12-06 16:41:47.392574067 +0000 -+++ pptp-1.7.2/pqueue.h 2011-12-06 16:41:47.407574075 +0000 -@@ -24,7 +24,7 @@ typedef struct pqueue { - - int pqueue_add (u_int32_t seq, unsigned char *packet, int packlen); - int pqueue_del (pqueue_t *point); --pqueue_t *pqueue_head (); -+pqueue_t *pqueue_head (void); - int pqueue_expiry_time (pqueue_t *entry); - - #endif /* PQUEUE_H */ -diff -up pptp-1.7.2/routing.c.prototype pptp-1.7.2/routing.c ---- pptp-1.7.2/routing.c.prototype 2011-12-06 16:41:47.388574065 +0000 -+++ pptp-1.7.2/routing.c 2011-12-06 16:41:47.407574075 +0000 -@@ -64,14 +64,14 @@ void routing_init(char *ip) { - /* TODO: check for failure of command */ - } - --void routing_start() { -+void routing_start(void) { - char buf[256]; - snprintf(buf, 255, "/sbin/ip route replace %s", route); - FILE *p = popen(buf, "r"); - pclose(p); - } - --void routing_end() { -+void routing_end(void) { - char buf[256]; - snprintf(buf, 255, "/sbin/ip route delete %s", route); - FILE *p = popen(buf, "r"); -diff -up pptp-1.7.2/routing.h.prototype pptp-1.7.2/routing.h ---- pptp-1.7.2/routing.h.prototype 2008-05-14 07:33:55.000000000 +0100 -+++ pptp-1.7.2/routing.h 2011-12-06 16:41:47.407574075 +0000 -@@ -1,3 +1,3 @@ - void routing_init(char *ip); --void routing_start(); --void routing_end(); -+void routing_start(void); -+void routing_end(void); -diff -up pptp-1.7.2/test.c.prototype pptp-1.7.2/test.c ---- pptp-1.7.2/test.c.prototype 2011-12-06 16:41:47.393574067 +0000 -+++ pptp-1.7.2/test.c 2011-12-06 16:41:47.408574076 +0000 -@@ -171,7 +171,7 @@ static ssize_t write_reordered(int fd, c - } - } - --struct test_redirections *test_redirections() -+struct test_redirections *test_redirections(void) - { - static struct test_redirections *my = NULL; - -diff -up pptp-1.7.2/test.h.prototype pptp-1.7.2/test.h ---- pptp-1.7.2/test.h.prototype 2008-05-14 07:33:55.000000000 +0100 -+++ pptp-1.7.2/test.h 2011-12-06 16:41:47.408574076 +0000 -@@ -2,4 +2,4 @@ struct test_redirections { - ssize_t (*write)(int fd, const void *buf, size_t count); - }; - --struct test_redirections *test_redirections(); -+struct test_redirections *test_redirections(void); -diff -up pptp-1.7.2/util.c.prototype pptp-1.7.2/util.c ---- pptp-1.7.2/util.c.prototype 2011-12-06 16:41:47.396574070 +0000 -+++ pptp-1.7.2/util.c 2011-12-06 16:41:47.409574076 +0000 -@@ -87,7 +87,7 @@ int file2fd(const char *path, const char - static int sigpipe[2]; - - /* create a signal pipe, returns 0 for success, -1 with errno for failure */ --int sigpipe_create() -+int sigpipe_create(void) - { - int rc; - -@@ -133,20 +133,20 @@ void sigpipe_assign(int signum) - } - - /* return the signal pipe read file descriptor for select(2) */ --int sigpipe_fd() -+int sigpipe_fd(void) - { - return sigpipe[0]; - } - - /* read and return the pending signal from the pipe */ --int sigpipe_read() -+int sigpipe_read(void) - { - int signum; - read(sigpipe[0], &signum, sizeof(signum)); - return signum; - } - --void sigpipe_close() -+void sigpipe_close(void) - { - close(sigpipe[0]); - close(sigpipe[1]); -diff -up pptp-1.7.2/util.h.prototype pptp-1.7.2/util.h ---- pptp-1.7.2/util.h.prototype 2011-12-06 16:41:47.396574070 +0000 -+++ pptp-1.7.2/util.h 2011-12-06 16:41:47.409574076 +0000 -@@ -35,7 +35,7 @@ int file2fd(const char *path, const char - /* signal to pipe delivery implementation */ - - /* create a signal pipe, returns 0 for success, -1 with errno for failure */ --int sigpipe_create(); -+int sigpipe_create(void); - - /* generic handler for signals, writes signal number to pipe */ - void sigpipe_handler(int signum); -@@ -44,11 +44,11 @@ void sigpipe_handler(int signum); - void sigpipe_assign(int signum); - - /* return the signal pipe read file descriptor for select(2) */ --int sigpipe_fd(); -+int sigpipe_fd(void); - - /* read and return the pending signal from the pipe */ --int sigpipe_read(); -+int sigpipe_read(void); - --void sigpipe_close(); -+void sigpipe_close(void); - - #endif /* INC_UTIL_H */ -diff -up pptp-1.7.2/vector.c.prototype pptp-1.7.2/vector.c ---- pptp-1.7.2/vector.c.prototype 2008-05-14 07:33:55.000000000 +0100 -+++ pptp-1.7.2/vector.c 2011-12-06 16:41:47.409574076 +0000 -@@ -35,7 +35,7 @@ struct vector_struct { - static struct vector_item *binary_search(VECTOR *v, int key); - - /*** vector_create ************************************************************/ --VECTOR *vector_create() -+VECTOR *vector_create(void) - { - const int INITIAL_SIZE = 4; - -diff -up pptp-1.7.2/vector.h.prototype pptp-1.7.2/vector.h ---- pptp-1.7.2/vector.h.prototype 2008-05-14 07:33:55.000000000 +0100 -+++ pptp-1.7.2/vector.h 2011-12-06 16:41:47.410574077 +0000 -@@ -12,7 +12,7 @@ - - typedef struct vector_struct VECTOR; - --VECTOR *vector_create(); -+VECTOR *vector_create(void); - void vector_destroy(VECTOR *v); - - int vector_size(VECTOR *v);
--- a/net-dialup/pptpclient/files/pptpclient-1.7.2-sign-compare.patch Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,150 +0,0 @@ -diff -up pptp-1.7.2/pptp_ctrl.c.sign-compare pptp-1.7.2/pptp_ctrl.c ---- pptp-1.7.2/pptp_ctrl.c.sign-compare 2011-11-30 16:33:00.877964659 +0000 -+++ pptp-1.7.2/pptp_ctrl.c 2011-11-30 18:49:17.603973525 +0000 -@@ -193,7 +193,7 @@ int ctrlp_disp(PPTP_CONN * conn, void * - void pptp_set_link(PPTP_CONN * conn, int peer_call_id); - - /*** log error information in control packets *********************************/ --static void ctrlp_error( int result, int error, int cause, -+static void ctrlp_error( int result, u_int8_t error, int cause, - const char *result_text[], int max_result) - { - if( cause >= 0) -@@ -238,7 +238,7 @@ static const char *ctrl_msg_types[] = { - #define MAX_CTRLMSG_TYPE 15 - - /*** report a sent packet ****************************************************/ --static void ctrlp_rep( void * buffer, int size, int isbuff) -+static void ctrlp_rep( void * buffer, size_t size, int isbuff) - { - struct pptp_header *packet = buffer; - unsigned int type; -@@ -532,7 +532,7 @@ int pptp_write_some(PPTP_CONN * conn) { - return -1; - } - } -- assert(retval <= conn->write_size); -+ assert((size_t)retval <= conn->write_size); - conn->write_size -= retval; - memmove(conn->write_buffer, conn->write_buffer + retval, conn->write_size); - ctrlp_rep(conn->write_buffer, retval, 0); -diff -up pptp-1.7.2/pptp_gre.c.sign-compare pptp-1.7.2/pptp_gre.c ---- pptp-1.7.2/pptp_gre.c.sign-compare 2011-11-30 16:33:00.899964648 +0000 -+++ pptp-1.7.2/pptp_gre.c 2011-11-30 16:33:00.911964643 +0000 -@@ -200,8 +200,7 @@ void pptp_gre_copy(u_int16_t call_id, u_ - int decaps_hdlc(int fd, int (*cb)(int cl, void *pack, unsigned int len), int cl) - { - unsigned char buffer[PACKET_MAX]; -- unsigned int start = 0; -- int end; -+ ssize_t start = 0, end; - int status; - static unsigned int len = 0, escape = 0; - static unsigned char copy[PACKET_MAX]; -@@ -210,7 +209,7 @@ int decaps_hdlc(int fd, int (*cb)(int cl - /* this is the only blocking read we will allow */ - if ((end = read (fd, buffer, sizeof(buffer))) <= 0) { - int saved_errno = errno; -- warn("short read (%d): %s", end, strerror(saved_errno)); -+ warn("short read (%zd): %s", end, strerror(saved_errno)); - switch (saved_errno) { - case EMSGSIZE: { - socklen_t optval, optlen = sizeof(optval); -@@ -499,7 +498,7 @@ int encaps_gre (int fd, void *pack, unsi - if (errno == ENOBUFS) - rc = 0; /* Simply ignore it */ - stats.tx_failed++; -- } else if (rc < sizeof(u.header) - sizeof(u.header.seq)) { -+ } else if ((size_t)rc < sizeof(u.header) - sizeof(u.header.seq)) { - stats.tx_short++; - } else { - stats.tx_acks++; -@@ -533,7 +532,7 @@ int encaps_gre (int fd, void *pack, unsi - if (errno == ENOBUFS) - rc = 0; /* Simply ignore it */ - stats.tx_failed++; -- } else if (rc < header_len + len) { -+ } else if ((size_t)rc < header_len + len) { - stats.tx_short++; - } else { - stats.tx_sent++; -diff -up pptp-1.7.2/pqueue.c.sign-compare pptp-1.7.2/pqueue.c ---- pptp-1.7.2/pqueue.c.sign-compare 2008-05-14 07:33:55.000000000 +0100 -+++ pptp-1.7.2/pqueue.c 2011-11-30 16:41:39.598648652 +0000 -@@ -17,7 +17,7 @@ - - #define MIN_CAPACITY 128 /* min allocated buffer for a packet */ - --static int pqueue_alloc (int seq, unsigned char *packet, int packlen, pqueue_t **new); -+static int pqueue_alloc (u_int32_t seq, unsigned char *packet, int packlen, pqueue_t **new); - - int packet_timeout_usecs = DEFAULT_PACKET_TIMEOUT * 1000000; - -@@ -29,7 +29,7 @@ static pqueue_t *pq_freelist_head = NULL - - - --static int pqueue_alloc(int seq, unsigned char *packet, int packlen, pqueue_t **new) { -+static int pqueue_alloc(u_int32_t seq, unsigned char *packet, int packlen, pqueue_t **new) { - - pqueue_t *newent; - -@@ -125,7 +125,7 @@ static int pqueue_alloc(int seq, unsigne - - - --int pqueue_add (int seq, unsigned char *packet, int packlen) { -+int pqueue_add (u_int32_t seq, unsigned char *packet, int packlen) { - pqueue_t *newent, *point; - - /* get a new entry */ -diff -up pptp-1.7.2/pqueue.h.sign-compare pptp-1.7.2/pqueue.h ---- pptp-1.7.2/pqueue.h.sign-compare 2008-05-14 07:33:55.000000000 +0100 -+++ pptp-1.7.2/pqueue.h 2011-11-30 18:42:16.733706666 +0000 -@@ -15,14 +15,14 @@ extern int packet_timeout_usecs; - typedef struct pqueue { - struct pqueue *next; - struct pqueue *prev; -- int seq; -+ u_int32_t seq; - struct timeval expires; - unsigned char *packet; - int packlen; - int capacity; - } pqueue_t; - --int pqueue_add (int seq, unsigned char *packet, int packlen); -+int pqueue_add (u_int32_t seq, unsigned char *packet, int packlen); - int pqueue_del (pqueue_t *point); - pqueue_t *pqueue_head (); - int pqueue_expiry_time (pqueue_t *entry); -diff -up pptp-1.7.2/test.c.sign-compare pptp-1.7.2/test.c ---- pptp-1.7.2/test.c.sign-compare 2008-05-14 07:33:55.000000000 +0100 -+++ pptp-1.7.2/test.c 2011-11-30 18:45:44.553853995 +0000 -@@ -52,7 +52,7 @@ static ssize_t write_reordered_swap(int - test_ordering_phase = 0; - /* send the new packet first */ - stat = write(fd, buf, count); -- if (stat != count) return stat; -+ if ((size_t)stat != count) return stat; - /* then send the old packet next */ - stat = write(fd, pocket_buf, pocket_count); - free(pocket_buf); -@@ -96,7 +96,7 @@ static ssize_t write_reordered_retransmi - test_ordering_phase = 0; - /* send the new packet first */ - stat = write(fd, buf, count); -- if (stat != count) return stat; -+ if ((size_t)stat != count) return stat; - /* send the buffered packets in normal order */ - for (n=0; n<test_length; n++) { - stat = write(fd, pocket_buf[n], pocket_count[n]); -@@ -142,7 +142,7 @@ static ssize_t write_reordered_reverse(i - test_ordering_phase = 0; - /* send the new packet first */ - stat = write(fd, buf, count); -- if (stat != count) return stat; -+ if ((size_t)stat != count) return stat; - /* send the buffered packets in reverse order */ - for (n=test_length-1; n>0; n--) { - stat = write(fd, pocket_buf[n], pocket_count[n]);
--- a/net-dialup/pptpclient/files/pptpclient-1.7.2-unused.patch Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,73 +0,0 @@ -diff -up pptp-1.7.2/pptp_callmgr.c.unused pptp-1.7.2/pptp_callmgr.c ---- pptp-1.7.2/pptp_callmgr.c.unused 2011-12-01 09:58:47.127960697 +0000 -+++ pptp-1.7.2/pptp_callmgr.c 2011-12-01 09:58:47.149960723 +0000 -@@ -38,12 +38,12 @@ void close_unixsock(int fd, struct in_ad - - sigjmp_buf callmgr_env; - --void callmgr_sighandler(int sig) { -+void callmgr_sighandler(int sig __attribute__ ((unused))) { - /* TODO: according to signal(2), siglongjmp() is unsafe used here */ - siglongjmp (callmgr_env, 1); - } - --void callmgr_do_nothing(int sig) { -+void callmgr_do_nothing(int sig __attribute__ ((unused))) { - /* do nothing signal handler */ - } - -@@ -104,7 +104,7 @@ void call_callback(PPTP_CONN *conn, PPTP - *****************************************************************************/ - - /*** Call Manager *************************************************************/ --int callmgr_main(int argc, char **argv, char **envp) -+int callmgr_main(int argc, char **argv, char **envp __attribute__ ((unused))) - { - struct in_addr inetaddr; - int inet_sock, unix_sock; -@@ -377,7 +377,7 @@ int open_unixsock(struct in_addr inetadd - } - - /*** close_inetsock ***********************************************************/ --void close_inetsock(int fd, struct in_addr inetaddr) -+void close_inetsock(int fd, struct in_addr inetaddr __attribute__ ((unused))) - { - close(fd); - } -diff -up pptp-1.7.2/pptp.c.unused pptp-1.7.2/pptp.c ---- pptp-1.7.2/pptp.c.unused 2011-12-01 09:58:47.143960715 +0000 -+++ pptp-1.7.2/pptp.c 2011-12-01 10:01:40.171147875 +0000 -@@ -151,13 +151,13 @@ void do_nothing(int sig) - sigjmp_buf env; - - /*** signal handler ***********************************************************/ --void sighandler(int sig) -+void sighandler(int sig __attribute__ ((unused))) - { - siglongjmp(env, 1); - } - - /*** report statistics signal handler (SIGUSR1) *******************************/ --void sigstats(int sig) -+void sigstats(int sig __attribute__ ((unused))) - { - syslog(LOG_NOTICE, "GRE statistics:\n"); - #define LOG(name,value) syslog(LOG_NOTICE, name "\n", stats .value) -@@ -508,7 +508,7 @@ int open_callmgr(struct in_addr inetaddr - } - - /*** call the call manager main ***********************************************/ --void launch_callmgr(struct in_addr inetaddr, char *phonenr, int argc, -+void launch_callmgr(struct in_addr inetaddr, char *phonenr, int argc __attribute__ ((unused)), - char**argv,char**envp) - { - char *my_argv[3] = { argv[0], inet_ntoa(inetaddr), phonenr }; -@@ -566,7 +566,7 @@ void launch_pppd(char *ttydev, int argc, - { - char *new_argv[argc + 4];/* XXX if not using GCC, hard code a limit here. */ - char str_pppd[] = PPPD_BINARY; -- char str_direct[] = "-direct"; -+ char str_direct[] __attribute__ ((unused)) = "-direct"; - char str_38400[] = "38400"; - int i = 0, j; - new_argv[i++] = str_pppd;
--- a/net-dialup/pptpclient/pptpclient-1.7.2-r3.ebuild Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,59 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/pptpclient-1.7.2-r2.ebuild,v 1.3 2010/04/29 19:46:17 truedfx Exp $ - -EAPI="2" - -inherit eutils toolchain-funcs - -MY_P=${P/client} -MY_CMD=pptp-command-20050401 - -DESCRIPTION="Linux client for PPTP" -HOMEPAGE="http://pptpclient.sourceforge.net/" -SRC_URI="mirror://sourceforge/pptpclient/${MY_P}.tar.gz - mirror://gentoo/${MY_CMD}.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="alpha amd64 ppc ppc64 x86" -IUSE="tk" - -DEPEND="net-dialup/ppp - dev-lang/perl - tk? ( dev-perl/perl-tk )" -RDEPEND="${DEPEND} - sys-apps/iproute2" - -RESTRICT="test" #make test is useless and vector_test.c is broken - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-process-name.patch - epatch "${FILESDIR}"/${P}-ip-path.patch - epatch "${FILESDIR}"/${P}-sign-compare.patch - epatch "${FILESDIR}"/${P}-const.patch - epatch "${FILESDIR}"/${P}-field-init.patch - epatch "${FILESDIR}"/${P}-unused.patch - epatch "${FILESDIR}"/${P}-prototype.patch - epatch "${FILESDIR}"/${P}-nested-externs.patch - epatch "${FILESDIR}"/${P}-aliasing.patch -} - -src_compile() { - emake OPTIMISE= DEBUG= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING - dodoc Documentation/* - dodir /etc/pptp.d - - # The current version of pptp-linux doesn't include the - # RH-specific portions, so include them ourselves. - newsbin "${WORKDIR}/${MY_CMD}" pptp-command - dosbin "${FILESDIR}/pptp_fe.pl" - use tk && dosbin "${FILESDIR}/xpptp_fe.pl" -}
--- a/net-im/skype/Manifest Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -DIST skype-4.1.0.20.tar.bz2 30500691 SHA256 c31e47cd5dcb14eead897f36bab80ee8d49c0e6dbf469c93bf745d5addec0ce2 SHA512 81cc8426d609735b6b86307300089365f43b5b492f6f99e7794b83a2b028f1e4031c0f045ec7a6e5ea4c34d618a6e1af56b21227f4b4049fb3e3430444228818 WHIRLPOOL 894fa9c8b97b02e88c23aa7a63edf49d3059e22c273220cd8cfc26cbe5e28e14a786b311b664208de1144153a7037f122d41830aeb1300a9646869a17387b406 -EBUILD skype-4.1.0.20.ebuild 2483 SHA256 2de1209091e828cd06a58f7fad046f7daf54559d5518a1c2eb0c26e72cb89fea SHA512 cefc821e4693832e0e8d4cea44a6e8e19346a3b857c6dfc0a68c60ef925e9f484b389dba17a4f7b2d36e84e618f59578d8b98f05b3df3f1ebb649e09c31cdfec WHIRLPOOL c31857f71854fd5f5a7b8510aad6f34a5f01690e889f21610c303a586ae1b606b935a396632b10cbce4a118f677e9dca22d306656a6df71b990e7d5371899528
--- a/net-im/skype/skype-4.1.0.20.ebuild Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,101 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header $ - -EAPI=4 -inherit eutils gnome2-utils pax-utils - -DESCRIPTION="An P2P Internet Telephony (VoiceIP) client" -HOMEPAGE="http://www.skype.com/" -SKYPE_URI="http://download.${PN}.com/linux" -SRC_URI="${SKYPE_URI}/${P}.tar.bz2" - -LICENSE="${P}-copyright ${P}-third-party_attributions.txt" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="pax_kernel" - -QA_PREBUILT=opt/bin/${PN} -RESTRICT="mirror strip" #299368 - -EMUL_X86_VER=20120520 - -RDEPEND="virtual/ttf-fonts - amd64? ( - >=app-emulation/emul-linux-x86-baselibs-${EMUL_X86_VER} - >=app-emulation/emul-linux-x86-soundlibs-${EMUL_X86_VER} - >=app-emulation/emul-linux-x86-xlibs-${EMUL_X86_VER} - >=app-emulation/emul-linux-x86-qtlibs-${EMUL_X86_VER} - ) - x86? ( - media-libs/alsa-lib - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXScrnSaver - x11-libs/libXv - x11-libs/qt-core:4 - x11-libs/qt-dbus:4 - x11-libs/qt-gui:4[accessibility,dbus] - )" - -src_unpack() { - unpack ${A} - [[ -d ${S} ]] || { mv skype* "${S}" || die; } -} - -src_compile() { - type -P lrelease >/dev/null && lrelease lang/*.ts - rm -f lang/*.ts -} - -src_install() { - into /opt - dobin ${PN} - fowners root:audio /opt/bin/${PN} - - insinto /etc/dbus-1/system.d - doins ${PN}.conf - - insinto /usr/share/skype - doins -r avatars lang sounds - - dodoc README - - local res - for res in 16 32 48; do - newicon -s ${res} icons/SkypeBlue_${res}x${res}.png ${PN}.png - done - - make_desktop_entry ${PN} 'Skype VoIP' ${PN} 'Network;InstantMessaging;Telephony' - - if use pax_kernel; then - pax-mark Cm "${ED}"/opt/bin/${PN} || die - eqawarn "You have set USE=pax_kernel meaning that you intend to run" - eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify" - eqawarn "the ${PN} binary itself and this *may* lead to breakage! If" - eqawarn "you suspect that ${PN} is being broken by this modification," - eqawarn "please open a bug." - fi -} - -pkg_preinst() { - gnome2_icon_savelist - - rm -rf "${EROOT}"/usr/share/${PN} #421165 -} - -pkg_postinst() { - gnome2_icon_cache_update - - # http://bugs.gentoo.org/360815 - elog "For webcam support, see \"LD_PRELOAD\" section of \"README.lib\" document provided by" - elog "media-libs/libv4l package and \"README\" document of this package." - if use amd64; then - elog "You can install app-emulation/emul-linux-x86-medialibs package for the 32bit" - elog "libraries from the media-libs/libv4l package." - fi -} - -pkg_postrm() { - gnome2_icon_cache_update -}
--- a/www-apps/redaxo/Manifest Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -DIST redaxo4_2_1.zip 2143442 RMD160 18d637be99cf076bf2a9feb59a98357da0db192a SHA1 b8f8a23c2b8b97d2b2eb854fafe3001e22840043 SHA256 4d9daacc0104a47cb05c43ffe6be5445b0ed0d00bee4bea9e58e1ac46fd5d61b -EBUILD redaxo-4.2.1.ebuild 2003 RMD160 6316f835508f1a20d3052c4fc77f218207bb8255 SHA1 76b8a8a4d0b53b5081c55139f88836841f572251 SHA256 a5b22b487dc4f19aae5f089f463613bf516de62754f885ecdaa266cdc689d308
--- a/www-apps/redaxo/redaxo-4.2.1.ebuild Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,73 +0,0 @@ - -EAPI=2 -inherit webapp depend.php versionator - -DESCRIPTION="PHP-powered CMS application." -HOMEPAGE="http://www.redaxo.de/" - -# translate redaxo-0.0.0 to redaxo0_0_0 -MY_PV=$(replace_all_version_separators '_') -MY_P=${PN}${MY_PV} -SRC_URI="http://www.redaxo.de/files/${MY_P}.zip" - -LICENSE="GPL" -KEYWORDS="~amd64 ~x86" -DEPEND="app-arch/unzip" -RDEPEND="virtual/httpd-cgi" - -need_php_httpd - -pkg_setup() { - webapp_pkg_setup - - if ! PHPCHECKNODIE="yes" require_php_with_any_use mysql ; then - eerror - eerror "${PHP_PKG} needs to be reinstalled with the mysql USE flag enabled." - die "Reinstall ${PHP_PKG} with the above-stated USE flags." - fi -} - -src_unpack() { - unpack ${A} - - # clean up some cruft that comes as part of the install package - cd ${WORKDIR}/${MY_P} - find . -name .DS_Store -exec rm {} \; - remove_if_exists _lastchanges.txt -} - -src_install() { - webapp_src_preinst - - einfo "Installing application files." - cd ${MY_P} - cp -r . "${D}"${MY_HTDOCSDIR} - - # .htaccess, index.php and the redaxo dir are part of the distro - local SERVEROWNED="index.php files files/_readme.txt files/addons \ - redaxo redaxo/include/clang.inc.php redaxo/include/plugins.inc.php \ - redaxo/include/addons.inc.php redaxo/include/master.inc.php \ - redaxo/include/generated redaxo/include/generated/* \ - redaxo/include/addons/* redaxo/include/addons/import_export/backup \ - redaxo/include/addons/image_resize/config.inc.php" - for SFILES in ${SERVEROWNED}; do - webapp_serverowned ${MY_HTDOCSDIR}/${SFILES} - done - - webapp_src_install -} - -webapp_pkg_postinst() { - einfo "This ebuild does not perform any autoinstall of the package" - einfo "" - einfo "This allows you to install redaxo directly into the top of" - einfo "your document root using:" - einfo "webapp-config -I -h localhost -u root redaxo ${PV}" - einfo "" -} - -function remove_if_exists() { - if [ -f $1 ]; then - rm $1 - fi -}
--- a/www-apps/serendipity/Manifest Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -DIST serendipity-1.3.1.tar.gz 4482417 SHA256 6304a5885f3c60188c1d49aa74e85908788ce50e006e9443a649be9f902edcba -DIST serendipity-1.4.1.tar.gz 5278932 SHA256 e950cff732323aaf3243d3a28afd18322cc7ab86daf81b21c2b4a2667d70e6f7 -DIST serendipity-1.4.tar.gz 5277144 SHA256 c636c4199d26eb262c077997850fa871a160c067404250752e8ca2d0804e098a -DIST serendipity-1.5.1.tar.gz 5337760 SHA256 5e6dc05208e115c3068f91a91687aa91078f19a36e630104146e2fc8a0ffcbe9 -DIST serendipity-1.5.2.tar.gz 5337799 SHA256 75544fd4104a2b1afbac6a80aa8ff0bb5bfc008dcdaa1e4531740d96e00465e5 -DIST serendipity-1.5.5.tar.gz 5338491 SHA256 b61bb613eba147a30b3be479a2cf8b218b2475d1f045127964e56fa285bdb657 -DIST serendipity-1.6.tar.gz 5357394 SHA256 c2fb8ba8ccb0a509004151eeb57dcdef78c6e137dfe839fe635042cf36a49365 -EBUILD serendipity-1.3.1.ebuild 1976 SHA256 5a06f6ae838bacdcaa4cfe0ca4f90ff6a10081b6eb20df457cc47e9b0db06f38 SHA512 5e5324ed041606ce4500fd7083715bb90b59bfe9e2615d4f0544387cdafae75c0f8cc99ca4718983f1aa5e5f895b3d420c0e173d2b201ff3965d76dc44e5d177 WHIRLPOOL d69c3860222a294b1701a6c5d136bdf34d79922d743d8b99e351dc9b39d50b3968ae287a4e9d92db05b449ac85eda1a50624d2d6c4fdd400d171ddc8ac06f13b -EBUILD serendipity-1.4.1.ebuild 2128 SHA256 227ab84ff8eef17579fe4352610f258ffede0ae18c362b42658c1638e6b64465 SHA512 2f9313bec70f7e049edba02d08d34d804124110f79e697bcd8e98efed8ef3bf1694aa54865ad9647fea91f842e4d33fa35855919fc2dce5f366e9fe1c485f6bd WHIRLPOOL 312e4005398736be0509951031f92b5ffdb0965dfd0ff0b338ffd5c39e1b6cca9f83a5705e49f8465e8d84c9e33b9ddb46bf96fa91561610b0695898592a56c7 -EBUILD serendipity-1.4.ebuild 1976 SHA256 5a06f6ae838bacdcaa4cfe0ca4f90ff6a10081b6eb20df457cc47e9b0db06f38 SHA512 5e5324ed041606ce4500fd7083715bb90b59bfe9e2615d4f0544387cdafae75c0f8cc99ca4718983f1aa5e5f895b3d420c0e173d2b201ff3965d76dc44e5d177 WHIRLPOOL d69c3860222a294b1701a6c5d136bdf34d79922d743d8b99e351dc9b39d50b3968ae287a4e9d92db05b449ac85eda1a50624d2d6c4fdd400d171ddc8ac06f13b -EBUILD serendipity-1.5.1.ebuild 2128 SHA256 227ab84ff8eef17579fe4352610f258ffede0ae18c362b42658c1638e6b64465 SHA512 2f9313bec70f7e049edba02d08d34d804124110f79e697bcd8e98efed8ef3bf1694aa54865ad9647fea91f842e4d33fa35855919fc2dce5f366e9fe1c485f6bd WHIRLPOOL 312e4005398736be0509951031f92b5ffdb0965dfd0ff0b338ffd5c39e1b6cca9f83a5705e49f8465e8d84c9e33b9ddb46bf96fa91561610b0695898592a56c7 -EBUILD serendipity-1.5.2.ebuild 2128 SHA256 227ab84ff8eef17579fe4352610f258ffede0ae18c362b42658c1638e6b64465 SHA512 2f9313bec70f7e049edba02d08d34d804124110f79e697bcd8e98efed8ef3bf1694aa54865ad9647fea91f842e4d33fa35855919fc2dce5f366e9fe1c485f6bd WHIRLPOOL 312e4005398736be0509951031f92b5ffdb0965dfd0ff0b338ffd5c39e1b6cca9f83a5705e49f8465e8d84c9e33b9ddb46bf96fa91561610b0695898592a56c7 -EBUILD serendipity-1.5.5.ebuild 2123 SHA256 8514b35a5e8e5c321f5e15306e1d12e4d2a7dd492dbfb8e11e86681017ffc998 SHA512 04369c886efde46959dada1008e9ecafba889de3445a9bd202812a43a9384e075f6e1939592a4a56e0d3814277e21729bb9197b2a87588dfba8d1f62fb721eb1 WHIRLPOOL 3c223b56a15d7afdecfdc14cad3c74c4d2122d0986070c387a89472bfe88e43f1b4541cf8e86a320fa7e4ece31373e22d7217b6d0a3488c95ed52257ad4c8ec6 -EBUILD serendipity-1.6.0.ebuild 2186 SHA256 5bbfdec818f7ebbd2f72444215a571b7663ad94ea3f60854f7a766e6ba3fc177 SHA512 6aa7e194e89e16090452ae733d3ce6d0e024b4e2471e167d5fb79b377673f0d5d550b99e26317fafcb2dc91f2775fe0e460885e149ad3fea71170cf8808f8f4c WHIRLPOOL fe7b881d8f232987d96d54400d117b33bc108beea29586ff81e01f69f621c37a71f27b9f726d33f6a137e9c84dd2cd4b3fe97a7a91c1b3be470d425cbdd6d2dc -EBUILD serendipity-1.6.2.ebuild 2186 SHA256 5bbfdec818f7ebbd2f72444215a571b7663ad94ea3f60854f7a766e6ba3fc177 SHA512 6aa7e194e89e16090452ae733d3ce6d0e024b4e2471e167d5fb79b377673f0d5d550b99e26317fafcb2dc91f2775fe0e460885e149ad3fea71170cf8808f8f4c WHIRLPOOL fe7b881d8f232987d96d54400d117b33bc108beea29586ff81e01f69f621c37a71f27b9f726d33f6a137e9c84dd2cd4b3fe97a7a91c1b3be470d425cbdd6d2dc
--- a/www-apps/serendipity/serendipity-1.3.1.ebuild Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit webapp depend.php - -DESCRIPTION="PHP-powered, flexible blogging/CMS application." -HOMEPAGE="http://www.s9y.org/" -SRC_URI="mirror://sourceforge/php-blog/${P}.tar.gz" - -LICENSE="BSD" -KEYWORDS="~amd64 ~x86" -IUSE="imagemagick" - -DEPEND="" -RDEPEND="virtual/httpd-cgi - imagemagick? ( media-gfx/imagemagick )" - -need_php_httpd - -S="${WORKDIR}/${PN}" - -pkg_setup() { - webapp_pkg_setup - - if ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli postgres sqlite \ - || ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external \ - || ! PHPCHECKNODIE="yes" require_php_with_use iconv pcre unicode zlib ; then - eerror - eerror "${PHP_PKG} needs to be reinstalled at least one of mysql, mysqli," - eerror "postgres or sqlite USE flags enabled for a database backend." - eerror "It must also have either gd or gd-external USE flag enabled." - eerror "It must also have all of iconv pcre unicode zlib USE flags enabled." - die "Reinstall ${PHP_PKG} with the above-stated USE flags." - fi -} - -src_install() { - webapp_src_preinst - - rm docs/INSTALL* - local docs="docs/*" - dodoc ${docs} - rm -rf docs/ - - einfo "Installing application files." - cp -r . "${D}"${MY_HTDOCSDIR} - touch "${D}"${MY_HTDOCSDIR}/.htaccess - touch "${D}"${MY_HTDOCSDIR}/serendipity_config_local.inc.php - - keepdir ${MY_HTDOCSDIR}/archives/ - webapp_configfile ${MY_HTDOCSDIR}/serendipity_config_local.inc.php - #webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt - - # archives, templates_c and uploads need to be writable to PHP - # .htaccess amd serendipity_config_local.inc.php need to be too - # plugins and templates need to be writable for spartacus support. - local SERVEROWNED="serendipity_config_local.inc.php .htaccess archives plugins templates templates_c uploads" - for SFILES in ${SERVEROWNED}; do - webapp_serverowned ${MY_HTDOCSDIR}/${SFILES} - done - - webapp_src_install -}
--- a/www-apps/serendipity/serendipity-1.4.1.ebuild Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit webapp depend.php - -DESCRIPTION="PHP-powered, flexible blogging/CMS application." -HOMEPAGE="http://www.s9y.org/" -SRC_URI="mirror://sourceforge/php-blog/${P}.tar.gz" - -LICENSE="BSD" -KEYWORDS="~amd64 ~x86" -IUSE="imagemagick" - -DEPEND="" -RDEPEND="virtual/httpd-cgi - imagemagick? ( media-gfx/imagemagick )" - -need_php_httpd - -S="${WORKDIR}/${PN}" - -pkg_setup() { - webapp_pkg_setup - - if ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli postgres sqlite \ - || ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external \ - || ! PHPCHECKNODIE="yes" require_php_with_use iconv pcre unicode xml zlib ; then - eerror - eerror "${PHP_PKG} needs to be reinstalled at least one of mysql, mysqli," - eerror "postgres or sqlite USE flags enabled for a database backend." - eerror "It must also have either gd or gd-external USE flag enabled." - eerror "It must also have all of iconv pcre unicode xml zlib USE flags enabled." - die "Reinstall ${PHP_PKG} with the above-stated USE flags." - fi -} - -src_install() { - webapp_src_preinst - - rm docs/INSTALL* - local docs="docs/*" - dodoc ${docs} - rm -rf docs/ - - einfo "Installing application files." - cp -r . "${D}"${MY_HTDOCSDIR} - touch "${D}"${MY_HTDOCSDIR}/.htaccess - touch "${D}"${MY_HTDOCSDIR}/serendipity_config_local.inc.php - - keepdir ${MY_HTDOCSDIR}/archives/ - webapp_configfile ${MY_HTDOCSDIR}/serendipity_config_local.inc.php - #webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt - - # archives, templates_c and uploads need to be writable to PHP - # .htaccess amd serendipity_config_local.inc.php need to be too - # plugins and templates need to be writable for spartacus support. - local SERVEROWNED="serendipity_config_local.inc.php .htaccess archives plugins templates templates_c uploads" - for SFILES in ${SERVEROWNED}; do - webapp_serverowned ${MY_HTDOCSDIR}/${SFILES} - done - - webapp_src_install -}
--- a/www-apps/serendipity/serendipity-1.4.ebuild Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit webapp depend.php - -DESCRIPTION="PHP-powered, flexible blogging/CMS application." -HOMEPAGE="http://www.s9y.org/" -SRC_URI="mirror://sourceforge/php-blog/${P}.tar.gz" - -LICENSE="BSD" -KEYWORDS="~amd64 ~x86" -IUSE="imagemagick" - -DEPEND="" -RDEPEND="virtual/httpd-cgi - imagemagick? ( media-gfx/imagemagick )" - -need_php_httpd - -S="${WORKDIR}/${PN}" - -pkg_setup() { - webapp_pkg_setup - - if ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli postgres sqlite \ - || ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external \ - || ! PHPCHECKNODIE="yes" require_php_with_use iconv pcre unicode zlib ; then - eerror - eerror "${PHP_PKG} needs to be reinstalled at least one of mysql, mysqli," - eerror "postgres or sqlite USE flags enabled for a database backend." - eerror "It must also have either gd or gd-external USE flag enabled." - eerror "It must also have all of iconv pcre unicode zlib USE flags enabled." - die "Reinstall ${PHP_PKG} with the above-stated USE flags." - fi -} - -src_install() { - webapp_src_preinst - - rm docs/INSTALL* - local docs="docs/*" - dodoc ${docs} - rm -rf docs/ - - einfo "Installing application files." - cp -r . "${D}"${MY_HTDOCSDIR} - touch "${D}"${MY_HTDOCSDIR}/.htaccess - touch "${D}"${MY_HTDOCSDIR}/serendipity_config_local.inc.php - - keepdir ${MY_HTDOCSDIR}/archives/ - webapp_configfile ${MY_HTDOCSDIR}/serendipity_config_local.inc.php - #webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt - - # archives, templates_c and uploads need to be writable to PHP - # .htaccess amd serendipity_config_local.inc.php need to be too - # plugins and templates need to be writable for spartacus support. - local SERVEROWNED="serendipity_config_local.inc.php .htaccess archives plugins templates templates_c uploads" - for SFILES in ${SERVEROWNED}; do - webapp_serverowned ${MY_HTDOCSDIR}/${SFILES} - done - - webapp_src_install -}
--- a/www-apps/serendipity/serendipity-1.5.1.ebuild Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit webapp depend.php - -DESCRIPTION="PHP-powered, flexible blogging/CMS application." -HOMEPAGE="http://www.s9y.org/" -SRC_URI="mirror://sourceforge/php-blog/${P}.tar.gz" - -LICENSE="BSD" -KEYWORDS="~amd64 ~x86" -IUSE="imagemagick" - -DEPEND="" -RDEPEND="virtual/httpd-cgi - imagemagick? ( media-gfx/imagemagick )" - -need_php_httpd - -S="${WORKDIR}/${PN}" - -pkg_setup() { - webapp_pkg_setup - - if ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli postgres sqlite \ - || ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external \ - || ! PHPCHECKNODIE="yes" require_php_with_use iconv pcre unicode xml zlib ; then - eerror - eerror "${PHP_PKG} needs to be reinstalled at least one of mysql, mysqli," - eerror "postgres or sqlite USE flags enabled for a database backend." - eerror "It must also have either gd or gd-external USE flag enabled." - eerror "It must also have all of iconv pcre unicode xml zlib USE flags enabled." - die "Reinstall ${PHP_PKG} with the above-stated USE flags." - fi -} - -src_install() { - webapp_src_preinst - - rm docs/INSTALL* - local docs="docs/*" - dodoc ${docs} - rm -rf docs/ - - einfo "Installing application files." - cp -r . "${D}"${MY_HTDOCSDIR} - touch "${D}"${MY_HTDOCSDIR}/.htaccess - touch "${D}"${MY_HTDOCSDIR}/serendipity_config_local.inc.php - - keepdir ${MY_HTDOCSDIR}/archives/ - webapp_configfile ${MY_HTDOCSDIR}/serendipity_config_local.inc.php - #webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt - - # archives, templates_c and uploads need to be writable to PHP - # .htaccess amd serendipity_config_local.inc.php need to be too - # plugins and templates need to be writable for spartacus support. - local SERVEROWNED="serendipity_config_local.inc.php .htaccess archives plugins templates templates_c uploads" - for SFILES in ${SERVEROWNED}; do - webapp_serverowned ${MY_HTDOCSDIR}/${SFILES} - done - - webapp_src_install -}
--- a/www-apps/serendipity/serendipity-1.5.2.ebuild Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit webapp depend.php - -DESCRIPTION="PHP-powered, flexible blogging/CMS application." -HOMEPAGE="http://www.s9y.org/" -SRC_URI="mirror://sourceforge/php-blog/${P}.tar.gz" - -LICENSE="BSD" -KEYWORDS="~amd64 ~x86" -IUSE="imagemagick" - -DEPEND="" -RDEPEND="virtual/httpd-cgi - imagemagick? ( media-gfx/imagemagick )" - -need_php_httpd - -S="${WORKDIR}/${PN}" - -pkg_setup() { - webapp_pkg_setup - - if ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli postgres sqlite \ - || ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external \ - || ! PHPCHECKNODIE="yes" require_php_with_use iconv pcre unicode xml zlib ; then - eerror - eerror "${PHP_PKG} needs to be reinstalled at least one of mysql, mysqli," - eerror "postgres or sqlite USE flags enabled for a database backend." - eerror "It must also have either gd or gd-external USE flag enabled." - eerror "It must also have all of iconv pcre unicode xml zlib USE flags enabled." - die "Reinstall ${PHP_PKG} with the above-stated USE flags." - fi -} - -src_install() { - webapp_src_preinst - - rm docs/INSTALL* - local docs="docs/*" - dodoc ${docs} - rm -rf docs/ - - einfo "Installing application files." - cp -r . "${D}"${MY_HTDOCSDIR} - touch "${D}"${MY_HTDOCSDIR}/.htaccess - touch "${D}"${MY_HTDOCSDIR}/serendipity_config_local.inc.php - - keepdir ${MY_HTDOCSDIR}/archives/ - webapp_configfile ${MY_HTDOCSDIR}/serendipity_config_local.inc.php - #webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt - - # archives, templates_c and uploads need to be writable to PHP - # .htaccess amd serendipity_config_local.inc.php need to be too - # plugins and templates need to be writable for spartacus support. - local SERVEROWNED="serendipity_config_local.inc.php .htaccess archives plugins templates templates_c uploads" - for SFILES in ${SERVEROWNED}; do - webapp_serverowned ${MY_HTDOCSDIR}/${SFILES} - done - - webapp_src_install -}
--- a/www-apps/serendipity/serendipity-1.5.5.ebuild Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit webapp depend.php - -DESCRIPTION="PHP-powered, flexible blogging/CMS application." -HOMEPAGE="http://www.s9y.org/" -SRC_URI="mirror://sourceforge/php-blog/${P}.tar.gz" - -LICENSE="BSD" -KEYWORDS="~amd64 ~x86" -IUSE="imagemagick" - -DEPEND="" -RDEPEND="virtual/httpd-cgi - imagemagick? ( media-gfx/imagemagick )" - -need_php_httpd - -S="${WORKDIR}/${PN}" - -pkg_setup() { - webapp_pkg_setup - - if ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli postgres sqlite \ - || ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external \ - || ! PHPCHECKNODIE="yes" require_php_with_use iconv unicode xml zlib ; then - eerror - eerror "${PHP_PKG} needs to be reinstalled at least one of mysql, mysqli," - eerror "postgres or sqlite USE flags enabled for a database backend." - eerror "It must also have either gd or gd-external USE flag enabled." - eerror "It must also have all of iconv pcre unicode xml zlib USE flags enabled." - die "Reinstall ${PHP_PKG} with the above-stated USE flags." - fi -} - -src_install() { - webapp_src_preinst - - rm docs/INSTALL* - local docs="docs/*" - dodoc ${docs} - rm -rf docs/ - - einfo "Installing application files." - cp -r . "${D}"${MY_HTDOCSDIR} - touch "${D}"${MY_HTDOCSDIR}/.htaccess - touch "${D}"${MY_HTDOCSDIR}/serendipity_config_local.inc.php - - keepdir ${MY_HTDOCSDIR}/archives/ - webapp_configfile ${MY_HTDOCSDIR}/serendipity_config_local.inc.php - #webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt - - # archives, templates_c and uploads need to be writable to PHP - # .htaccess amd serendipity_config_local.inc.php need to be too - # plugins and templates need to be writable for spartacus support. - local SERVEROWNED="serendipity_config_local.inc.php .htaccess archives plugins templates templates_c uploads" - for SFILES in ${SERVEROWNED}; do - webapp_serverowned ${MY_HTDOCSDIR}/${SFILES} - done - - webapp_src_install -}
--- a/www-apps/serendipity/serendipity-1.6.0.ebuild Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,65 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit webapp depend.php versionator - -DESCRIPTION="PHP-powered, flexible blogging/CMS application." -HOMEPAGE="http://www.s9y.org/" -MY_P="${PN}-$(get_version_component_range 1-2)" -SRC_URI="mirror://sourceforge/php-blog/${MY_P}.tar.gz" - -LICENSE="BSD" -KEYWORDS="~amd64 ~x86" -IUSE="imagemagick" - -DEPEND="" -RDEPEND="virtual/httpd-cgi - imagemagick? ( media-gfx/imagemagick )" - -need_php_httpd - -S="${WORKDIR}/${PN}" - -pkg_setup() { - webapp_pkg_setup - - if ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli postgres sqlite \ - || ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external \ - || ! PHPCHECKNODIE="yes" require_php_with_use iconv unicode xml zlib ; then - eerror - eerror "${PHP_PKG} needs to be reinstalled at least one of mysql, mysqli," - eerror "postgres or sqlite USE flags enabled for a database backend." - eerror "It must also have either gd or gd-external USE flag enabled." - eerror "It must also have all of iconv pcre unicode xml zlib USE flags enabled." - die "Reinstall ${PHP_PKG} with the above-stated USE flags." - fi -} - -src_install() { - webapp_src_preinst - - rm docs/INSTALL* - local docs="docs/*" - dodoc ${docs} - rm -rf docs/ - - einfo "Installing application files." - cp -r . "${D}"${MY_HTDOCSDIR} - touch "${D}"${MY_HTDOCSDIR}/.htaccess - touch "${D}"${MY_HTDOCSDIR}/serendipity_config_local.inc.php - - keepdir ${MY_HTDOCSDIR}/archives/ - webapp_configfile ${MY_HTDOCSDIR}/serendipity_config_local.inc.php - #webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt - - # archives, templates_c and uploads need to be writable to PHP - # .htaccess amd serendipity_config_local.inc.php need to be too - # plugins and templates need to be writable for spartacus support. - local SERVEROWNED="serendipity_config_local.inc.php .htaccess archives plugins templates templates_c uploads" - for SFILES in ${SERVEROWNED}; do - webapp_serverowned ${MY_HTDOCSDIR}/${SFILES} - done - - webapp_src_install -}
--- a/www-apps/serendipity/serendipity-1.6.2.ebuild Tue Nov 11 09:54:30 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,65 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit webapp depend.php versionator - -DESCRIPTION="PHP-powered, flexible blogging/CMS application." -HOMEPAGE="http://www.s9y.org/" -MY_P="${PN}-$(get_version_component_range 1-2)" -SRC_URI="mirror://sourceforge/php-blog/${MY_P}.tar.gz" - -LICENSE="BSD" -KEYWORDS="~amd64 ~x86" -IUSE="imagemagick" - -DEPEND="" -RDEPEND="virtual/httpd-cgi - imagemagick? ( media-gfx/imagemagick )" - -need_php_httpd - -S="${WORKDIR}/${PN}" - -pkg_setup() { - webapp_pkg_setup - - if ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli postgres sqlite \ - || ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external \ - || ! PHPCHECKNODIE="yes" require_php_with_use iconv unicode xml zlib ; then - eerror - eerror "${PHP_PKG} needs to be reinstalled at least one of mysql, mysqli," - eerror "postgres or sqlite USE flags enabled for a database backend." - eerror "It must also have either gd or gd-external USE flag enabled." - eerror "It must also have all of iconv pcre unicode xml zlib USE flags enabled." - die "Reinstall ${PHP_PKG} with the above-stated USE flags." - fi -} - -src_install() { - webapp_src_preinst - - rm docs/INSTALL* - local docs="docs/*" - dodoc ${docs} - rm -rf docs/ - - einfo "Installing application files." - cp -r . "${D}"${MY_HTDOCSDIR} - touch "${D}"${MY_HTDOCSDIR}/.htaccess - touch "${D}"${MY_HTDOCSDIR}/serendipity_config_local.inc.php - - keepdir ${MY_HTDOCSDIR}/archives/ - webapp_configfile ${MY_HTDOCSDIR}/serendipity_config_local.inc.php - #webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt - - # archives, templates_c and uploads need to be writable to PHP - # .htaccess amd serendipity_config_local.inc.php need to be too - # plugins and templates need to be writable for spartacus support. - local SERVEROWNED="serendipity_config_local.inc.php .htaccess archives plugins templates templates_c uploads" - for SFILES in ${SERVEROWNED}; do - webapp_serverowned ${MY_HTDOCSDIR}/${SFILES} - done - - webapp_src_install -}