diff options
Diffstat (limited to 'testing')
26 files changed, 641 insertions, 107 deletions
diff --git a/testing/acl/PKGBUILD b/testing/acl/PKGBUILD new file mode 100644 index 000000000..f3d4796dc --- /dev/null +++ b/testing/acl/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 157730 2012-04-29 04:51:57Z dreisner $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> + +pkgname=acl +pkgver=2.2.51 +pkgrel=2 +pkgdesc="Access control list utilities, libraries and headers" +arch=('i686' 'x86_64') +url="http://savannah.nongnu.org/projects/acl" +license=('LGPL') +depends=('attr>=2.4.46') +replaces=('xfsacl') +provides=('xfsacl') +conflicts=('xfsacl') +options=('!libtool') +source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.src.tar.gz"{,.sig}) +sha256sums=('06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225' + '10893e2a044905acc88e2d98291e739b7b858b36c836ff66a3532909964067ce') + +build() { + cd "$pkgname-$pkgver" + + export INSTALL_USER=root INSTALL_GROUP=root + ./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib + make +} + +package() { + make -C "$pkgname-$pkgver" DIST_ROOT="$pkgdir" install install-lib install-dev + + # tidy up + rm -f "$pkgdir"/usr/lib/libacl.a + chmod 0755 "$pkgdir"/usr/lib/libacl.so.*.*.* +} diff --git a/testing/attr/PKGBUILD b/testing/attr/PKGBUILD new file mode 100644 index 000000000..29e263c80 --- /dev/null +++ b/testing/attr/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 157732 2012-04-29 04:55:24Z dreisner $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> + +pkgname=attr +pkgver=2.4.46 +pkgrel=2 +pkgdesc="Extended attribute support library for ACL support" +arch=('i686' 'x86_64') +url="http://savannah.nongnu.org/projects/attr" +license=('LGPL') +depends=('glibc') +makedepends=('gettext') +replaces=('xfsattr') +provides=('xfsattr') +conflicts=('xfsattr') +options=('!libtool') +source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.src.tar.gz"{,.sig}) +sha256sums=('dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f' + 'a8ee37a0d02c0365049b8a06dc6963e6698a448ff2c0a54ed040f0c60f27bca3') + +build() { + cd "$pkgname-$pkgver" + + export INSTALL_USER=root INSTALL_GROUP=root + ./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib + make +} + +package() { + make -C "$pkgname-$pkgver" DIST_ROOT="$pkgdir" install install-lib install-dev + + # tidy up + rm -f "$pkgdir"/usrlib/libattr.a + chmod 0755 "$pkgdir"/usr/lib/libattr.so.*.*.* + + # remove conflicting manpages + rm -rf "$pkgdir"/usr/share/man/man2 +} diff --git a/testing/bzip2/PKGBUILD b/testing/bzip2/PKGBUILD new file mode 100644 index 000000000..e02696cc8 --- /dev/null +++ b/testing/bzip2/PKGBUILD @@ -0,0 +1,65 @@ +# $Id: PKGBUILD 157765 2012-04-29 08:16:05Z allan $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Judd <jvinet@zeroflux.org> + +pkgname=bzip2 +pkgver=1.0.6 +pkgrel=4 +pkgdesc="A high-quality data compression program" +arch=('i686' 'x86_64') +license=('custom') +url="http://sources.redhat.com/bzip2" +groups=('base') +depends=('glibc') +source=(http://www.bzip.org/$pkgver/bzip2-$pkgver.tar.gz + bzip2-1.0.4-bzip2recover.patch) +sha1sums=('3f89f861209ce81a6bab1fd1998c0ef311712002' + '85ce76fdb67f52f152bba368c1de81132dcdbdb5') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # add large-file support + sed -e 's/^CFLAGS=\(.*\)$/CFLAGS=\1 \$(BIGFILES)/' -i ./Makefile-libbz2_so + + # use our optimization + sed -i "s|-O2|${CFLAGS}|g" Makefile + sed -i "s|-O2|${CFLAGS}|g" Makefile-libbz2_so + + patch -Np1 < ../bzip2-1.0.4-bzip2recover.patch + + make -f Makefile-libbz2_so + make bzip2 bzip2recover libbz2.a +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make test +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + install -dm755 $pkgdir/usr/{bin,lib,include,share/man/man1} + + install -m755 bzip2-shared $pkgdir/usr/bin/bzip2 + install -m755 bzip2recover bzdiff bzgrep bzmore $pkgdir/usr/bin + ln -sf bzip2 $pkgdir/usr/bin/bunzip2 + ln -sf bzip2 $pkgdir/usr/bin/bzcat + + install -m755 libbz2.so.1.0.6 $pkgdir/usr/lib + ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so + ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so.1 + ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so.1.0 + install -m644 libbz2.a ${pkgdir}/usr/lib/libbz2.a + + install -m644 bzlib.h $pkgdir/usr/include/ + + install -m644 bzip2.1 $pkgdir/usr/share/man/man1/ + ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bunzip2.1 + ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bzcat.1 + ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bzip2recover.1 + + install -Dm644 $srcdir/${pkgname}-${pkgver}/LICENSE \ + $pkgdir/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/testing/bzip2/bzip2-1.0.4-bzip2recover.patch b/testing/bzip2/bzip2-1.0.4-bzip2recover.patch new file mode 100644 index 000000000..e2bfe1cc1 --- /dev/null +++ b/testing/bzip2/bzip2-1.0.4-bzip2recover.patch @@ -0,0 +1,12 @@ +--- bzip2-1.0.4/bzip2recover.c.pom 2007-01-03 03:00:55.000000000 +0100 ++++ bzip2-1.0.4/bzip2recover.c 2007-02-05 11:55:17.000000000 +0100 +@@ -309,7 +309,8 @@ + UInt32 buffHi, buffLo, blockCRC; + Char* p; + +- strcpy ( progName, argv[0] ); ++ strncpy ( progName, argv[0], BZ_MAX_FILENAME-1); ++ progName[BZ_MAX_FILENAME-1]='\0'; + inFileName[0] = outFileName[0] = 0; + + fprintf ( stderr, diff --git a/testing/crda/PKGBUILD b/testing/crda/PKGBUILD new file mode 100644 index 000000000..1202d7890 --- /dev/null +++ b/testing/crda/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 157767 2012-04-29 08:23:51Z allan $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> + +pkgname=crda +pkgver=1.1.2 +pkgrel=3 +pkgdesc="Central Regulatory Domain Agent for wireless networks" +arch=(i686 x86_64) +url="http://wireless.kernel.org/en/developers/Regulatory/CRDA" +license=('custom') +depends=('wireless-regdb' 'libnl' 'libgcrypt' 'udev' 'iw') +makedepends=('python-m2crypto') +install=crda.install +source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2 + crda.rc libnl32.patch) +md5sums=('5226f65aebacf94baaf820f8b4e06df4' + '014eef3f8655e9a130064ec6891317fc' + 'c1f7aff29f15a0364ae6f7905a1d4ae6') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + patch -Np1 -i "$srcdir/libnl32.patch" + sed 's|^#!/usr/bin/env python|#!/usr/bin/python2|' -i utils/key2pub.py + make crda regdbdump +} + +package() { + # Install crda, regdbdump and udev rules + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" UDEV_RULE_DIR=/usr/lib/udev/rules.d/ install + # This rule automatically sets the regulatory domain when cfg80211 is loaded + echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/etc/rc.d/wireless-regdom start >/dev/null"' >> "${pkgdir}"/usr/lib/udev/rules.d/85-regulatory.rules + + install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}"/usr/share/licenses/crda/LICENSE + + install -D -m755 "${srcdir}"/crda.rc "${pkgdir}"/etc/rc.d/wireless-regdom +} diff --git a/testing/crda/crda.install b/testing/crda/crda.install new file mode 100644 index 000000000..c18e15f71 --- /dev/null +++ b/testing/crda/crda.install @@ -0,0 +1,18 @@ +## arg 1: the new package version +post_install() { + echo "Uncomment the right regulatory domain in /etc/conf.d/wireless-regdom." + echo "It will automatically be set when necessary." +} + +## arg 1: the new package version +## arg 2: the old package version +post_upgrade() { + # In an upgrade from 1.0.1-1 or older, the wireless-regdom file moves from the crda package + # to the new wireless-regdb package. If the user changed the file, it is save to overwrite the one + # from wireless-regdb by the user-defined one + if [ $(vercmp $2 1.0.1-2) -lt 0 ]; then + if [ -f /etc/conf.d/wireless-regdom.pacorig -a -n "$(grep -v ^# /etc/conf.d/wireless-regdom.pacorig 2>/dev/null | grep -v ^$)" ]; then + mv /etc/conf.d/wireless-regdom.pacorig /etc/conf.d/wireless-regdom + fi + fi +} diff --git a/testing/crda/crda.rc b/testing/crda/crda.rc new file mode 100755 index 000000000..13dbd870e --- /dev/null +++ b/testing/crda/crda.rc @@ -0,0 +1,26 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/wireless-regdom + +case "$1" in + start) + if [ -n "${WIRELESS_REGDOM}" ]; then + stat_busy "Setting wireless regulatory domain: ${WIRELESS_REGDOM}" + if iw reg set ${WIRELESS_REGDOM}; then + stat_done + else + stat_fail + fi + fi + ;; + stop) + ;; + restart) + $0 start + ;; + *) + echo "usage: $0 start" +esac +exit 0 diff --git a/testing/crda/libnl32.patch b/testing/crda/libnl32.patch new file mode 100644 index 000000000..682b6c5de --- /dev/null +++ b/testing/crda/libnl32.patch @@ -0,0 +1,12 @@ +diff -u -r crda-1.1.2/Makefile crda-1.1.2-libnl32/Makefile +--- crda-1.1.2/Makefile 2011-08-10 01:36:19.000000000 +0200 ++++ crda-1.1.2-libnl32/Makefile 2012-02-09 18:53:33.376430180 +0100 +@@ -51,7 +51,7 @@ + + ifeq ($(NL3FOUND),Y) + CFLAGS += -DCONFIG_LIBNL30 +-NLLIBS += -lnl-genl ++NLLIBS += $(shell pkg-config --libs libnl-genl-3.0) + NLLIBNAME = libnl-3.0 + else + ifeq ($(NL2FOUND),Y) diff --git a/testing/dmraid/PKGBUILD b/testing/dmraid/PKGBUILD index b3786478a..71dfb914b 100644 --- a/testing/dmraid/PKGBUILD +++ b/testing/dmraid/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 156525 2012-04-20 11:53:35Z tpowa $ +# $Id: PKGBUILD 157738 2012-04-29 05:29:44Z dreisner $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> #Contributor: Urs Wolfer <uwolfer @ fwo.ch> pkgname=dmraid pkgver=1.0.0.rc16.3 -pkgrel=3 +pkgrel=4 pkgdesc="Device mapper RAID interface" url="http://people.redhat.com/~heinzm/sw/dmraid/" conflicts=('mkinitcpio<0.7') @@ -17,23 +17,23 @@ source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2 dmraid_hook) install=dmraid.install md5sums=('819338fcef98e8e25819f0516722beeb' - '94dede91754b00783f1cd5244f6647bc' - '2a1ef82fb32f065ee560dceef736475e') + '832ed57a0f7ca6ba72adebcba2b17f87' + 'faec669dc85f87187b45b5d3968efe2c') build() { - cd "$srcdir"/$pkgname/1.0.0.rc16-3/$pkgname + cd "$pkgname/1.0.0.rc16-3/$pkgname" ./configure --enable-led --enable-intel_led make } package() { - cd "$srcdir"/$pkgname/1.0.0.rc16-3/$pkgname - make DESTDIR="$pkgdir" prefix=/ libdir=/lib mandir=/usr/share/man includedir=/usr/include install + cd "$pkgname/1.0.0.rc16-3/$pkgname" + make DESTDIR="$pkgdir" prefix=/usr libdir=/usr/lib mandir=/usr/share/man includedir=/usr/include install mkdir -p "$pkgdir"/var/lock/dmraid chmod 1777 "$pkgdir"/var/lock/ install -D -m644 "$srcdir"/dmraid_install "$pkgdir"/usr/lib/initcpio/install/dmraid install -D -m644 "$srcdir"/dmraid_hook "$pkgdir"/usr/lib/initcpio/hooks/dmraid # fix permissions - chmod 644 "$pkgdir"/lib/libdmraid.a + chmod 644 "$pkgdir"/usr/lib/libdmraid.a chmod 644 "$pkgdir"/usr/include/dmraid/* } diff --git a/testing/dmraid/dmraid_hook b/testing/dmraid/dmraid_hook index 6219a718a..37283e83e 100644 --- a/testing/dmraid/dmraid_hook +++ b/testing/dmraid/dmraid_hook @@ -1,19 +1,14 @@ -# vim: set ft=sh: -run_hook () -{ - /sbin/modprobe -q dm-mod >/dev/null 2>&1 - /sbin/modprobe -q dm-mirror >/dev/null 2>&1 - if [ -e "/sys/class/misc/device-mapper" ]; then - if [ ! -e "/dev/mapper/control" ]; then - mkdir /dev/mapper - mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') - fi - msg ":: Activating dmraid arrays..." - # prevent any event monitoring calls with -I - if [ "${quiet}" = "y" ]; then - /sbin/dmraid -ay -I -Z >/dev/null - else - /sbin/dmraid -ay -I -Z - fi +#!/usr/bin/ash + +run_hook() { + modprobe -a -q dm-mod dm-mirror >/dev/null 2>&1 + msg ":: Activating dmraid arrays..." + # prevent any event monitoring calls with -I + if [ "$quiet" = "y" ]; then + dmraid -ay -I -Z >/dev/null + else + dmraid -ay -I -Z fi } + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/testing/dmraid/dmraid_install b/testing/dmraid/dmraid_install index 0ebfd0c0f..c48e6ceaf 100644 --- a/testing/dmraid/dmraid_install +++ b/testing/dmraid/dmraid_install @@ -1,19 +1,19 @@ -# vim: set ft=sh: +#!/bin/bash -build() -{ +build() { MODULES=" dm-mod dm-mirror " - BINARIES="/sbin/dmraid /sbin/dmsetup" - FILES="" + BINARIES="dmraid dmsetup" SCRIPT="dmraid" + add_file "/usr/lib/udev/rules.d/10-dm.rules" add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" } -help () -{ -cat<<HELPEOF - This hook loads the necessary modules for a dmraid root device. +help() { + cat <<HELPEOF +This hook loads the necessary modules for a dmraid root device. HELPEOF } + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/testing/e2fsprogs/PKGBUILD b/testing/e2fsprogs/PKGBUILD index 5257a03b6..8f80a6043 100644 --- a/testing/e2fsprogs/PKGBUILD +++ b/testing/e2fsprogs/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 154926 2012-03-31 08:27:07Z ronald $ +# $Id: PKGBUILD 157769 2012-04-29 09:29:25Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=e2fsprogs pkgver=1.42.2 -pkgrel=1 +pkgrel=2 pkgdesc="Ext2/3/4 filesystem utilities" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'MIT') url="http://e2fsprogs.sourceforge.net" groups=('base') -depends=('sh' 'util-linux-ng') +depends=('sh' 'util-linux') makedepends=('bc') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'MIT-LICENSE') @@ -25,8 +25,8 @@ build() { # Remove unnecessary init.d directory sed -i '/init\.d/s|^|#|' misc/Makefile.in - ./configure --prefix=/usr --with-root-prefix="" --enable-elf-shlibs \ - --disable-fsck --disable-uuidd \ + ./configure --prefix=/usr --with-root-prefix="" --libdir=/usr/lib \ + --enable-elf-shlibs --disable-fsck --disable-uuidd \ --disable-libuuid --disable-libblkid make diff --git a/testing/graphviz/LICENSE b/testing/graphviz/LICENSE new file mode 100644 index 000000000..16cc69a52 --- /dev/null +++ b/testing/graphviz/LICENSE @@ -0,0 +1,87 @@ +Eclipse Public License - v 1.0 + +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + +a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and + +b) in the case of each subsequent Contributor: + +i) changes to the Program, and + +ii) additions to the Program; + +where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. + +"Contributor" means any person or entity that distributes the Program. + +"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. + +"Program" means the Contributions distributed in accordance with this Agreement. + +"Recipient" means anyone who receives the Program under this Agreement, including all Contributors. + +2. GRANT OF RIGHTS + +a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form. + +b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. + +c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program. + +d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. + +3. REQUIREMENTS + +A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: + +a) it complies with the terms and conditions of this Agreement; and + +b) its license agreement: + +i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; + +ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; + +iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and + +iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. + +When the Program is made available in source code form: + +a) it must be made available under this Agreement; and + +b) a copy of this Agreement must be included with each copy of the Program. + +Contributors may not remove or alter any copyright notices contained within the Program. + +Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. + +This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. diff --git a/testing/graphviz/PKGBUILD b/testing/graphviz/PKGBUILD new file mode 100644 index 000000000..58df7bcbc --- /dev/null +++ b/testing/graphviz/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 157755 2012-04-29 06:41:34Z pierre $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: kevin <kevin@archlinux.org> +# Contributor: John Proctor <jproctor@prium.net> + +pkgname=graphviz +pkgver=2.28.0 +pkgrel=9 +pkgdesc='Graph visualization software' +url='http://www.graphviz.org/' +license=('custom:EPL') +arch=('i686' 'x86_64') +depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts') +makedepends=('swig' 'mono' 'guile' 'lua' 'ocaml' 'perl' 'php' 'python2' 'r' 'ruby' 'tk' 'qt') +optdepends=('mono: sharp bindings' + 'guile: guile bindings' + 'lua: lua bindings' + 'ocaml: ocaml bindings' + 'perl: perl bindings' + 'php: php bindings' + 'python2: python bindings' + 'r: r bindings' + 'ruby: ruby bindings' + 'tcl: tcl bindings' + 'qt: gvedit') +source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz" + 'LICENSE') +sha1sums=('4725d88a13e071ee22e632de551d4a55ca08ee7d' + 'e78277e502c29abb74b9587a5dc951ec392554ea') + +options=('!libtool') +install=install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed \ + -e '/"archdir"/s:$:+" '"$(echo -I/usr/include/ruby-1.9.1/{$CARCH-linux,ruby/backward,})"'":' \ + -e '/CONFIG/s:site:vendor:' \ + -i config/config_ruby.rb + + sed '/LIBPOSTFIX="64"/d' -i configure + export PYTHON=python2 + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + # cf. http://www.graphviz.org/License.php + install -Dm644 ../LICENSE "${pkgdir}"/usr/share/licenses/graphviz/LICENSE +} diff --git a/testing/graphviz/install b/testing/graphviz/install new file mode 100644 index 000000000..65fba522b --- /dev/null +++ b/testing/graphviz/install @@ -0,0 +1,12 @@ +post_install() { + rm -f usr/lib/graphviz/config{,6} + usr/bin/dot -c +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f usr/lib/graphviz/config{,6} +} diff --git a/testing/linux-atm/PKGBUILD b/testing/linux-atm/PKGBUILD new file mode 100644 index 000000000..14e98013c --- /dev/null +++ b/testing/linux-atm/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 157771 2012-04-29 09:40:54Z allan $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Surain Mallawa Arachchi <mas@crc32.net> + +pkgname=linux-atm +pkgver=2.5.2 +pkgrel=2 +pkgdesc="Drivers and tools to support ATM networking under Linux." +arch=('i686' 'x86_64') +depends=('glibc') +url="http://linux-atm.sourceforge.net/" +license=(GPL) +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz + man-pages.patch) +options=(!libtool !makeflags) +md5sums=('d49499368c3cf15f73a05d9bce8824a8' + '181390736336cdb615ae32f1ae5acfa6') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ../man-pages.patch + + # install firmware in /usr/lib + sed -i "s#/lib/firmware#/usr/lib/firmware#" src/extra/Makefile.in + + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/linux-atm/man-pages.patch b/testing/linux-atm/man-pages.patch new file mode 100644 index 000000000..c504cfe87 --- /dev/null +++ b/testing/linux-atm/man-pages.patch @@ -0,0 +1,45 @@ +diff -up linux-atm-2.5.1/src/led/zeppelin.8.fixman linux-atm-2.5.1/src/led/zeppelin.8 +--- linux-atm-2.5.1/src/led/zeppelin.8.fixman 2003-05-02 19:35:04.000000000 +0200 ++++ linux-atm-2.5.1/src/led/zeppelin.8 2010-10-13 12:58:18.000000000 +0200 +@@ -99,7 +99,7 @@ Ring and ATM parts of the ELAN, so using + recommended. Token Ring support has received less testing than its + Ethernet counterpart. + .SH FILES +-.IP \fI/var/run/lec[interface number].pid\fP ++\fI/var/run/lec[interface number].pid\fP + The file containing the process id of zeppelin. + .SH BUGS + John Bonham died 1980 and Led Zeppelin broke. +diff -up linux-atm-2.5.1/src/mpoad/mpcd.8.fixman linux-atm-2.5.1/src/mpoad/mpcd.8 +--- linux-atm-2.5.1/src/mpoad/mpcd.8.fixman 2001-10-10 00:33:07.000000000 +0200 ++++ linux-atm-2.5.1/src/mpoad/mpcd.8 2010-10-13 12:59:14.000000000 +0200 +@@ -28,7 +28,7 @@ mpcd \- ATM MPOA (Multi\-Protocol Over A + .B ]] + .SH DESCRIPTION + MPOA client +-.SM(MPC) is responsible for creating and receiving ++.SM (MPC) is responsible for creating and receiving + internetwork layer shortcuts. Using these shortcuts MPCs forward + unicast internetwork layer packets effectively over ATM without need + for routing protocols. +@@ -43,7 +43,7 @@ accepts shortcuts and packets arriving o + shortcuts is done with the help of + .SM MPOA + server +-.SM(MPS). ++.SM (MPS). + .PP + Just as the Linux + .SM LAN +diff -up linux-atm-2.5.1/src/sigd/atmsigd.conf.4.fixman linux-atm-2.5.1/src/sigd/atmsigd.conf.4 +--- linux-atm-2.5.1/src/sigd/atmsigd.conf.4.fixman 2001-10-10 00:33:07.000000000 +0200 ++++ linux-atm-2.5.1/src/sigd/atmsigd.conf.4 2010-10-13 12:58:49.000000000 +0200 +@@ -125,7 +125,7 @@ a comment. The `#' character cannot be e + .P + If an option is specified in \fBatmsigd.conf\fP and on the command + line, the command line has priority. +-.COMPATIBILITY ++.SH COMPATIBILITY + Certain options used by past versions of \fBatmsigd\fP but no longer documented + on the man page are still recognized and supported, but they also yield a + warning message. Future versions of \fBatmsigd\fP will not recognize those diff --git a/testing/nilfs-utils/PKGBUILD b/testing/nilfs-utils/PKGBUILD new file mode 100644 index 000000000..1cd89e22a --- /dev/null +++ b/testing/nilfs-utils/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 157773 2012-04-29 09:45:01Z allan $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> + +pkgname=nilfs-utils +pkgver=2.1.1 +pkgrel=2 +pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)" +arch=('i686' 'x86_64') +url="http://www.nilfs.org/" +license=('GPL2' 'LGPL2.1') +backup=('etc/nilfs_cleanerd.conf') +depends=('util-linux') +options=(!libtool) +source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2) +md5sums=('caa7d8b7121311bd978120e2f0c45d81') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --enable-libmount + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install LDCONFIG=/bin/true +} diff --git a/testing/openssh/PKGBUILD b/testing/openssh/PKGBUILD index 0a52bc805..67b39ac7e 100644 --- a/testing/openssh/PKGBUILD +++ b/testing/openssh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 156652 2012-04-22 08:07:55Z bisson $ +# $Id: PKGBUILD 157788 2012-04-29 14:11:24Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=openssh pkgver=6.0p1 -pkgrel=1 +pkgrel=2 pkgdesc='Free version of the SSH connectivity tools' url='http://www.openssh.org/portable.html' license=('custom:BSD') @@ -20,7 +20,7 @@ source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver} sha1sums=('f691e53ef83417031a2854b8b1b661c9c08e4422' '954bf1660aa32620c37034320877f4511b767ccb' 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' - '3413909fd45a28701c92e6e5b59c6b65346ddb0f' + '659e3ee95c269014783ff8b318c6f50bf7496fbd' '21fa88de6cc1c7912e71655f50896ba17991a1c2') backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd') diff --git a/testing/openssh/sshd.pam b/testing/openssh/sshd.pam index c7b91cdfb..aeef8be27 100644 --- a/testing/openssh/sshd.pam +++ b/testing/openssh/sshd.pam @@ -8,5 +8,6 @@ account required pam_time.so password required pam_unix.so session required pam_unix_session.so session required pam_limits.so +session optional pam_loginuid.so -session optional pam_ck_connector.so nox11 -session optional pam_systemd.so diff --git a/testing/php-apc/PKGBUILD b/testing/php-apc/PKGBUILD new file mode 100644 index 000000000..217b3d3c6 --- /dev/null +++ b/testing/php-apc/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 157759 2012-04-29 06:41:39Z pierre $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgname=php-apc +pkgver=3.1.10 +pkgrel=2 +arch=('i686' 'x86_64') +pkgdesc='A free, open, and robust framework for caching and optimizing PHP intermediate code' +url='http://pecl.php.net/package/APC' +depends=('php') +license=('PHP') +source=("http://pecl.php.net/get/APC-${pkgver}.tgz") +backup=('etc/php/conf.d/apc.ini') +md5sums=('f4a6b91903d6ba9dce89fc87bb6f26c9') + +build() { + cd $srcdir/APC-$pkgver + phpize + ./configure --prefix=/usr + make +} + +# check() { +# cd $srcdir/APC-$pkgver +# make test +# } + +package() { + cd $srcdir/APC-$pkgver + make INSTALL_ROOT=$pkgdir install + echo ';extension=apc.so' > apc.ini + install -D -m644 apc.ini $pkgdir/etc/php/conf.d/apc.ini + install -D -m644 apc.php $pkgdir/usr/share/php-apc/apc.php + install -D -m644 INSTALL $pkgdir/usr/share/doc/php-apc/install.txt +} diff --git a/testing/php/PKGBUILD b/testing/php/PKGBUILD index fe09f5643..3c2202bb3 100644 --- a/testing/php/PKGBUILD +++ b/testing/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 155941 2012-04-09 13:41:06Z andyrtr $ +# $Id: PKGBUILD 157757 2012-04-29 06:41:37Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -21,44 +21,35 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.3.10 -_suhosinver=5.3.9-0.9.10 -pkgrel=5 +pkgver=5.4.1 +pkgrel=2 arch=('i686' 'x86_64') license=('PHP') url='http://www.php.net' -makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' - 'sqlite3' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' +makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx' + 'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu' 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2') source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" - "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz" - "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig" 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' - 'logrotate.d.php-fpm' 'pcre_info.patch') -md5sums=('816259e5ca7d0a7e943e56a3bb32b17f' - 'c099b3d7eac95018ababd41ded7f3066' - 'c15d18f846be1d69144a5d0056ee6506' - 'ffc338e8ce2a990f6f2a486355bbab65' + 'logrotate.d.php-fpm') +md5sums=('5b9529ed89dbc48c498e9693d1af3caf' + '0b0bc7a917fc592bdf11dcd3c5c255e9' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' 'b01be5f816988fcee7e78225836e5e27' - '740ec5fe2ecfd9d7febd4081c90ec65b' - '07c4e412909ac65a44ec90e7a2c4bade' - '8d3806bbb19e390f9b32ccf21611d937') + '59b3a25f9eb3afc02f1adf9ee699808c' + '07c4e412909ac65a44ec90e7a2c4bade') build() { phpconfig="--srcdir=../${pkgbase}-${pkgver} \ + --config-cache \ --prefix=/usr \ --sysconfdir=/etc/php \ --localstatedir=/var \ --with-layout=GNU \ --with-config-file-path=/etc/php \ --with-config-file-scan-dir=/etc/php/conf.d \ - --enable-inline-optimization \ - --disable-debug \ --disable-rpath \ - --disable-static \ - --enable-shared \ --mandir=/usr/share/man \ --without-pear \ " @@ -70,36 +61,31 @@ build() { --enable-ftp=shared \ --enable-gd-native-ttf \ --enable-intl=shared \ - --enable-json=shared \ - --enable-mbregex \ --enable-mbstring \ - --enable-pdo \ --enable-phar=shared \ --enable-posix=shared \ - --enable-session \ --enable-shmop=shared \ --enable-soap=shared \ --enable-sockets=shared \ - --enable-sqlite-utf8 \ --enable-sysvmsg=shared \ --enable-sysvsem=shared \ --enable-sysvshm=shared \ - --enable-xml \ --enable-zip=shared \ --with-bz2=shared \ --with-curl=shared \ --with-db4=/usr \ --with-enchant=shared,/usr \ - --with-freetype-dir=shared,/usr \ + --with-freetype-dir=/usr \ --with-gd=shared \ - --with-gdbm=shared \ + --with-gdbm \ --with-gettext=shared \ --with-gmp=shared \ --with-iconv=shared \ --with-icu-dir=/usr \ - --with-imap-ssl=shared \ + --with-imap-ssl \ --with-imap=shared \ - --with-jpeg-dir=shared,/usr \ + --with-jpeg-dir=/usr \ + --with-vpx-dir=/usr \ --with-ldap=shared \ --with-ldap-sasl \ --with-mcrypt=shared \ @@ -115,19 +101,15 @@ build() { --with-pdo-pgsql=shared \ --with-pdo-sqlite=shared,/usr \ --with-pgsql=shared \ - --with-png-dir=shared,/usr \ + --with-png-dir=/usr \ --with-pspell=shared \ - --with-regex=php \ --with-snmp=shared \ --with-sqlite3=shared,/usr \ - --with-sqlite=shared \ --with-tidy=shared \ --with-unixODBC=shared,/usr \ --with-xmlrpc=shared \ --with-xsl=shared \ --with-zlib \ - --without-db2 \ - --without-db3 \ " EXTENSION_DIR=/usr/lib/php/modules @@ -137,11 +119,6 @@ build() { cd ${srcdir}/${pkgbase}-${pkgver} - patch -p1 -i ${srcdir}/pcre_info.patch - - # apply suhosin patch - patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch - # adjust paths patch -p0 -i ${srcdir}/php.ini.patch patch -p0 -i ${srcdir}/php-fpm.conf.in.patch @@ -279,11 +256,8 @@ package_php-pear() { backup=('etc/php/pear.conf') cd ${srcdir}/build-pear - make -j1 install-pear INSTALL_ROOT=${pkgdir} - local i - while read i; do - [ ! -e "$i" ] || rm -rf "$i" - done < <(find ${pkgdir} -name '.*') + make install-pear INSTALL_ROOT=${pkgdir} + rm -rf ${pkgdir}/usr/share/pear/.{channels,depdb,depdblock,filemap,lock,registry} } package_php-enchant() { @@ -293,7 +267,7 @@ package_php-enchant() { } package_php-gd() { - depends=('php' 'libpng' 'libjpeg' 'freetype2') + depends=('php' 'libpng' 'libjpeg' 'freetype2' 'libvpx') pkgdesc='gd module for PHP' install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so } @@ -349,8 +323,8 @@ package_php-snmp() { } package_php-sqlite() { - depends=('php' 'sqlite3') - pkgdesc='sqlite3 module for PHP' + depends=('php' 'sqlite') + pkgdesc='sqlite module for PHP' install -D -m755 ${srcdir}/build-php/modules/sqlite3.so ${pkgdir}/usr/lib/php/modules/sqlite3.so install -D -m755 ${srcdir}/build-php/modules/pdo_sqlite.so ${pkgdir}/usr/lib/php/modules/pdo_sqlite.so } diff --git a/testing/php/php-fpm.conf.in.patch b/testing/php/php-fpm.conf.in.patch index b923edb38..4e0f4a888 100644 --- a/testing/php/php-fpm.conf.in.patch +++ b/testing/php/php-fpm.conf.in.patch @@ -1,5 +1,5 @@ --- sapi/fpm/php-fpm.conf.in 2011-10-08 23:04:10.000000000 +0200 -+++ sapi/fpm/php-fpm.conf.in 2012-01-11 10:50:14.905161442 +0100 ++++ sapi/fpm/php-fpm.conf.in 2012-03-01 19:50:48.549947258 +0100 @@ -12,7 +12,7 @@ ; Relative path can also be used. They will be prefixed by: ; - the global prefix if it's been set (-p arguement) @@ -26,7 +26,7 @@ +;listen = 127.0.0.1:9000 +listen = /var/run/php-fpm/php-fpm.sock - ; Set listen(2) backlog. A value of '-1' means unlimited. + ; Set listen(2) backlog. ; Default Value: 128 (-1 on FreeBSD and OpenBSD) @@ -151,9 +152,9 @@ ; BSD-derived systems allow connections regardless of permissions. diff --git a/testing/php/php.ini.patch b/testing/php/php.ini.patch index 3dc5b6560..bbaae2152 100644 --- a/testing/php/php.ini.patch +++ b/testing/php/php.ini.patch @@ -1,6 +1,6 @@ ---- php.ini-production 2011-12-15 11:31:02.000000000 +0100 -+++ php.ini-production 2012-01-11 10:43:02.069936043 +0100 -@@ -376,7 +376,7 @@ +--- php.ini-production 2012-03-29 06:17:59.000000000 +0200 ++++ php.ini-production 2012-03-30 10:46:21.181340861 +0200 +@@ -305,7 +305,7 @@ ; or per-virtualhost web server configuration file. This directive is ; *NOT* affected by whether Safe Mode is turned On or Off. ; http://php.net/open-basedir @@ -9,7 +9,7 @@ ; This directive allows you to disable certain functions for security reasons. ; It receives a comma-delimited list of function names. This directive is -@@ -793,7 +793,7 @@ +@@ -702,7 +702,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;; ; UNIX: "/path1:/path2" @@ -18,7 +18,7 @@ ; ; Windows: "\path1;\path2" ;include_path = ".;c:\php\includes" -@@ -816,7 +816,7 @@ +@@ -725,7 +725,7 @@ ; Directory in which the loadable extensions (modules) reside. ; http://php.net/extension-dir @@ -27,7 +27,7 @@ ; On windows: ; extension_dir = "ext" -@@ -950,53 +950,49 @@ +@@ -859,51 +859,47 @@ ; If you only provide the name of the extension, PHP will look for it in its ; default extension directory. ; @@ -55,7 +55,6 @@ -;extension=php_oci8_11g.dll ; Use with Oracle 11gR2 Instant Client -;extension=php_openssl.dll -;extension=php_pdo_firebird.dll --;extension=php_pdo_mssql.dll -;extension=php_pdo_mysql.dll -;extension=php_pdo_oci.dll -;extension=php_pdo_odbc.dll @@ -71,7 +70,6 @@ - -;extension=php_soap.dll -;extension=php_sockets.dll --;extension=php_sqlite.dll -;extension=php_sqlite3.dll -;extension=php_sybase_ct.dll -;extension=php_tidy.dll @@ -92,7 +90,6 @@ +;extension=iconv.so +;extension=imap.so +;extension=intl.so -+extension=json.so +;extension=ldap.so +;extension=mcrypt.so +;extension=mssql.so @@ -113,7 +110,6 @@ +;extension=soap.so +;extension=sockets.so +;extension=sqlite3.so -+;extension=sqlite.so +;extension=sysvmsg.so +;extension=sysvsem.so +;extension=sysvshm.so diff --git a/testing/sysfsutils/PKGBUILD b/testing/sysfsutils/PKGBUILD new file mode 100644 index 000000000..e70eb3c6e --- /dev/null +++ b/testing/sysfsutils/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 157736 2012-04-29 05:13:38Z dreisner $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> + +pkgname=sysfsutils +pkgver=2.1.0 +pkgrel=8 +pkgdesc="System Utilities Based on Sysfs" +arch=(i686 x86_64) +license=('GPL' 'LGPL') +url="http://linux-diag.sourceforge.net/Sysfsutils.html" +groups=('base') +depends=('glibc') +source=(http://downloads.sourceforge.net/sourceforge/linux-diag/${pkgname}-${pkgver}.tar.gz) +md5sums=('14e7dcd0436d2f49aa403f67e1ef7ddc') +options=(!libtool) + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +check() { + cd "$pkgname-$pkgver" + make check +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + rm "$pkgdir/usr/lib/libsysfs.a" +} diff --git a/testing/xfce4-session/PKGBUILD b/testing/xfce4-session/PKGBUILD index 3c313b5da..95bc4ef03 100644 --- a/testing/xfce4-session/PKGBUILD +++ b/testing/xfce4-session/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 157699 2012-04-29 02:55:15Z foutrelis $ +# $Id: PKGBUILD 157800 2012-04-29 16:48:26Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfce4-session pkgver=4.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="A session manager for Xfce" arch=('i686' 'x86_64') url="http://www.xfce.org/" @@ -12,10 +12,10 @@ license=('GPL2') groups=('xfce4') # keep xorg-server-utils for https://bugs.archlinux.org/task/21096 # upower and consolekit for reboot/shutdown/hibernate/suspend -depends=('libxfce4ui' 'libgnome-keyring' 'libwnck' 'libsm' 'xorg-iceauth' - 'upower' 'consolekit' 'hicolor-icon-theme') +depends=('libxfce4ui' 'libwnck' 'libsm' 'xorg-iceauth' 'upower' 'consolekit' + 'hicolor-icon-theme') makedepends=('intltool') -optdepends=('fortune-mod: for xfce4-tips') +optdepends=('gnome-keyring: for keyring support when GNOME compatibility is enabled') replaces=('xfce-utils') options=('!libtool') install=$pkgname.install |