[arch-commits] Commit in cifs-utils/trunk (PKGBUILD)
Date: Friday, March 2, 2012 @ 03:41:52
Author: tpowa
Revision: 151752
upgpkg: cifs-utils 5.3-2
remove wrong uid and gid in samba start script #28240, splitted libwbclient for
cifs-utils
Modified:
cifs-utils/trunk/PKGBUILD
--+
PKGBUILD |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-02 07:58:39 UTC (rev 151751)
+++ PKGBUILD2012-03-02 08:41:52 UTC (rev 151752)
@@ -2,14 +2,13 @@
# Maintainer: Tobias Powalowski tp...@archlinux.org
pkgname=cifs-utils
pkgver=5.3
-pkgrel=1
+pkgrel=2
pkgdesc=CIFS filesystem user-space tools
arch=(i686 x86_64)
url=http://wiki.samba.org/index.php/LinuxCIFS_utils;
license=('GPL')
-depends=('libcap-ng' 'keyutils' 'krb5' 'talloc')
+depends=('libcap-ng' 'keyutils' 'krb5' 'talloc' 'libwbclient')
source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2)
-# deinstall smbclient first!
build() {
cd $srcdir/$pkgname-$pkgver
[arch-commits] Commit in cifs-utils/repos/extra-x86_64 (PKGBUILD PKGBUILD)
Date: Friday, March 2, 2012 @ 03:42:11
Author: tpowa
Revision: 151753
archrelease: copy trunk to extra-x86_64
Added:
cifs-utils/repos/extra-x86_64/PKGBUILD
(from rev 151752, cifs-utils/trunk/PKGBUILD)
Deleted:
cifs-utils/repos/extra-x86_64/PKGBUILD
--+
PKGBUILD | 51 +--
1 file changed, 25 insertions(+), 26 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2012-03-02 08:41:52 UTC (rev 151752)
+++ PKGBUILD2012-03-02 08:42:11 UTC (rev 151753)
@@ -1,26 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski tp...@archlinux.org
-pkgname=cifs-utils
-pkgver=5.3
-pkgrel=1
-pkgdesc=CIFS filesystem user-space tools
-arch=(i686 x86_64)
-url=http://wiki.samba.org/index.php/LinuxCIFS_utils;
-license=('GPL')
-depends=('libcap-ng' 'keyutils' 'krb5' 'talloc')
-source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2)
-# deinstall smbclient first!
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir install
- # set mount.cifs uid, to enable none root mounting form fstab
- chmod +s $pkgdir/sbin/mount.cifs
-}
-md5sums=('e1a428558a96d2d28ccdaacdc47ea0b7')
Copied: cifs-utils/repos/extra-x86_64/PKGBUILD (from rev 151752,
cifs-utils/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2012-03-02 08:42:11 UTC (rev 151753)
@@ -0,0 +1,25 @@
+# $Id$
+# Maintainer: Tobias Powalowski tp...@archlinux.org
+pkgname=cifs-utils
+pkgver=5.3
+pkgrel=2
+pkgdesc=CIFS filesystem user-space tools
+arch=(i686 x86_64)
+url=http://wiki.samba.org/index.php/LinuxCIFS_utils;
+license=('GPL')
+depends=('libcap-ng' 'keyutils' 'krb5' 'talloc' 'libwbclient')
+source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2)
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=$pkgdir install
+ # set mount.cifs uid, to enable none root mounting form fstab
+ chmod +s $pkgdir/sbin/mount.cifs
+}
+md5sums=('e1a428558a96d2d28ccdaacdc47ea0b7')
[arch-commits] Commit in samba/trunk (PKGBUILD fix-ipv6-mount.patch samba)
Date: Friday, March 2, 2012 @ 03:42:42
Author: tpowa
Revision: 151754
upgpkg: samba 3.6.3-2
remove wrong uid and gid in samba start script #28240, splitted libwbclient for
cifs-utils
Modified:
samba/trunk/PKGBUILD
samba/trunk/samba
Deleted:
samba/trunk/fix-ipv6-mount.patch
--+
PKGBUILD | 26 +-
fix-ipv6-mount.patch | 11 ---
samba|4 ++--
3 files changed, 19 insertions(+), 22 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-02 08:42:11 UTC (rev 151753)
+++ PKGBUILD2012-03-02 08:42:42 UTC (rev 151754)
@@ -2,13 +2,13 @@
# Maintainer: Tobias Powalowski tp...@archlinux.org
# Contributor: judd jvi...@zeroflux.org
pkgbase=samba
-pkgname=('smbclient' 'samba')
+pkgname=('libwbclient' 'smbclient' 'samba')
pkgver=3.6.3
# We use the 'A' to fake out pacman's version comparators. Samba chooses
# to append 'a','b',etc to their subsequent releases, which pamcan
# misconstrues as alpha, beta, etc. Bad samba!
_realver=3.6.3
-pkgrel=1
+pkgrel=2
arch=(i686 x86_64)
url=http://www.samba.org;
license=('GPL3')
@@ -17,8 +17,7 @@
samba samba.logrotate
swat.xinetd
samba.pam
-samba.conf.d
-fix-ipv6-mount.patch)
+samba.conf.d)
### UNINSTALL dmapi package before building!!!
build() {
@@ -48,13 +47,23 @@
make
}
+package_libwbclient () {
+pkgdesc=Samba winbind client library
+depends=('glibc')
+ cd ${srcdir}/${pkgbase}-${_realver}/source3
+ mkdir -p ${pkgdir}/usr/lib
+ for i in libwbclient*; do
+ cp -a bin/${i}*.so* ${pkgdir}/usr/lib/
+ done
+}
+
package_smbclient () {
pkgdesc=Tools to access a server's filespace and printers via SMB
-depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db'
'e2fsprogs' 'tdb' 'talloc')
+depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db'
'e2fsprogs' 'tdb' 'talloc' 'libwbclient')
cd ${srcdir}/${pkgbase}-${_realver}/source3
mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib
install -m755
bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup}
${pkgdir}/usr/bin/
- for i in libnetapi* libwbclient* libsmbclient*;do
+ for i in libnetapi* libsmbclient*;do
cp -a bin/${i}*.so* ${pkgdir}/usr/lib/
done
install -m755 script/smbtar ${pkgdir}/usr/bin/
@@ -137,9 +146,8 @@
install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema
${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
}
md5sums=('98ac9db9f4b6ebfc3f013aa193ffb0d1'
- 'a3da19515a234c703876cf850c44e996'
+ 'dfc6f9018c556b9783c7140de183727f'
'5697da77590ec092cc8a883bae06093c'
'a4bbfa39fee95bba2e7ad6b535fae7e6'
'96f82c38f3f540b53f3e5144900acf17'
- 'f2f2e348acd1ccb566e95fa8a561b828'
- 'c6a38a8c8fa24979e6217aed533358ea')
+ 'f2f2e348acd1ccb566e95fa8a561b828')
Deleted: fix-ipv6-mount.patch
===
--- fix-ipv6-mount.patch2012-03-02 08:42:11 UTC (rev 151753)
+++ fix-ipv6-mount.patch2012-03-02 08:42:42 UTC (rev 151754)
@@ -1,11 +0,0 @@
client/mount.cifs.c.orig 2010-03-03 13:42:02.143936727 +1000
-+++ client/mount.cifs.c2010-03-04 01:53:22.752879004 +1000
-@@ -1563,7 +1563,7 @@
- }
- }
-
-- if (addr-ai_addr-sa_family == AF_INET6 addr6-sin6_scope_id) {
-+ if (addr addr-ai_addr-sa_family == AF_INET6
addr6-sin6_scope_id) {
- strlcat(options, %, options_size);
- current_len = strnlen(options, options_size);
- optionstail = options + current_len;
Modified: samba
===
--- samba 2012-03-02 08:42:11 UTC (rev 151753)
+++ samba 2012-03-02 08:42:42 UTC (rev 151754)
@@ -11,10 +11,10 @@
rc=0
stat_busy Starting Samba Server
if [ ! -x /var/run/samba ] ; then
- install -m755 -g 81 -o 81 -d /var/run/samba
+ install -m755 -d /var/run/samba
fi
if [ ! -x /var/log/samba ] ; then
-install -m755 -g 81 -o 81 -d /var/log/samba
+install -m755 -d /var/log/samba
fi
for d in ${SAMBA_DAEMONS[@]}; do
PID=`pidof -o %PPID /usr/sbin/$d`
[arch-commits] Commit in samba/repos (26 files)
Date: Friday, March 2, 2012 @ 03:43:36 Author: tpowa Revision: 151755 archrelease: copy trunk to extra-i686, extra-x86_64 Added: samba/repos/extra-i686/PKGBUILD (from rev 151754, samba/trunk/PKGBUILD) samba/repos/extra-i686/samba (from rev 151754, samba/trunk/samba) samba/repos/extra-i686/samba.conf.d (from rev 151754, samba/trunk/samba.conf.d) samba/repos/extra-i686/samba.logrotate (from rev 151754, samba/trunk/samba.logrotate) samba/repos/extra-i686/samba.pam (from rev 151754, samba/trunk/samba.pam) samba/repos/extra-i686/swat.xinetd (from rev 151754, samba/trunk/swat.xinetd) samba/repos/extra-x86_64/PKGBUILD (from rev 151754, samba/trunk/PKGBUILD) samba/repos/extra-x86_64/samba (from rev 151754, samba/trunk/samba) samba/repos/extra-x86_64/samba.conf.d (from rev 151754, samba/trunk/samba.conf.d) samba/repos/extra-x86_64/samba.logrotate (from rev 151754, samba/trunk/samba.logrotate) samba/repos/extra-x86_64/samba.pam (from rev 151754, samba/trunk/samba.pam) samba/repos/extra-x86_64/swat.xinetd (from rev 151754, samba/trunk/swat.xinetd) Deleted: samba/repos/extra-i686/PKGBUILD samba/repos/extra-i686/fix-ipv6-mount.patch samba/repos/extra-i686/samba samba/repos/extra-i686/samba.conf.d samba/repos/extra-i686/samba.logrotate samba/repos/extra-i686/samba.pam samba/repos/extra-i686/swat.xinetd samba/repos/extra-x86_64/PKGBUILD samba/repos/extra-x86_64/fix-ipv6-mount.patch samba/repos/extra-x86_64/samba samba/repos/extra-x86_64/samba.conf.d samba/repos/extra-x86_64/samba.logrotate samba/repos/extra-x86_64/samba.pam samba/repos/extra-x86_64/swat.xinetd ---+ extra-i686/PKGBUILD | 298 ++-- extra-i686/fix-ipv6-mount.patch | 11 - extra-i686/samba | 114 ++--- extra-i686/samba.conf.d | 14 - extra-i686/samba.logrotate| 18 +- extra-i686/samba.pam |6 extra-i686/swat.xinetd| 20 +- extra-x86_64/PKGBUILD | 298 ++-- extra-x86_64/fix-ipv6-mount.patch | 11 - extra-x86_64/samba| 114 ++--- extra-x86_64/samba.conf.d | 14 - extra-x86_64/samba.logrotate | 18 +- extra-x86_64/samba.pam|6 extra-x86_64/swat.xinetd | 20 +- 14 files changed, 478 insertions(+), 484 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 151754:151755 to see the changes.
[arch-commits] Commit in cifs-utils/repos (4 files)
Date: Friday, March 2, 2012 @ 03:44:51
Author: tpowa
Revision: 151756
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
cifs-utils/repos/extra-i686/PKGBUILD
(from rev 151755, cifs-utils/trunk/PKGBUILD)
cifs-utils/repos/extra-x86_64/PKGBUILD
(from rev 151755, cifs-utils/trunk/PKGBUILD)
Deleted:
cifs-utils/repos/extra-i686/PKGBUILD
cifs-utils/repos/extra-x86_64/PKGBUILD
---+
extra-i686/PKGBUILD | 51 +++-
extra-x86_64/PKGBUILD | 50 +++
2 files changed, 50 insertions(+), 51 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-03-02 08:43:36 UTC (rev 151755)
+++ extra-i686/PKGBUILD 2012-03-02 08:44:51 UTC (rev 151756)
@@ -1,26 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski tp...@archlinux.org
-pkgname=cifs-utils
-pkgver=5.3
-pkgrel=1
-pkgdesc=CIFS filesystem user-space tools
-arch=(i686 x86_64)
-url=http://wiki.samba.org/index.php/LinuxCIFS_utils;
-license=('GPL')
-depends=('libcap-ng' 'keyutils' 'krb5' 'talloc')
-source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2)
-# deinstall smbclient first!
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir install
- # set mount.cifs uid, to enable none root mounting form fstab
- chmod +s $pkgdir/sbin/mount.cifs
-}
-md5sums=('e1a428558a96d2d28ccdaacdc47ea0b7')
Copied: cifs-utils/repos/extra-i686/PKGBUILD (from rev 151755,
cifs-utils/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-03-02 08:44:51 UTC (rev 151756)
@@ -0,0 +1,25 @@
+# $Id$
+# Maintainer: Tobias Powalowski tp...@archlinux.org
+pkgname=cifs-utils
+pkgver=5.3
+pkgrel=2
+pkgdesc=CIFS filesystem user-space tools
+arch=(i686 x86_64)
+url=http://wiki.samba.org/index.php/LinuxCIFS_utils;
+license=('GPL')
+depends=('libcap-ng' 'keyutils' 'krb5' 'talloc' 'libwbclient')
+source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2)
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=$pkgdir install
+ # set mount.cifs uid, to enable none root mounting form fstab
+ chmod +s $pkgdir/sbin/mount.cifs
+}
+md5sums=('e1a428558a96d2d28ccdaacdc47ea0b7')
Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD 2012-03-02 08:43:36 UTC (rev 151755)
+++ extra-x86_64/PKGBUILD 2012-03-02 08:44:51 UTC (rev 151756)
@@ -1,25 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski tp...@archlinux.org
-pkgname=cifs-utils
-pkgver=5.3
-pkgrel=2
-pkgdesc=CIFS filesystem user-space tools
-arch=(i686 x86_64)
-url=http://wiki.samba.org/index.php/LinuxCIFS_utils;
-license=('GPL')
-depends=('libcap-ng' 'keyutils' 'krb5' 'talloc' 'libwbclient')
-source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2)
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir install
- # set mount.cifs uid, to enable none root mounting form fstab
- chmod +s $pkgdir/sbin/mount.cifs
-}
-md5sums=('e1a428558a96d2d28ccdaacdc47ea0b7')
Copied: cifs-utils/repos/extra-x86_64/PKGBUILD (from rev 151755,
cifs-utils/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-03-02 08:44:51 UTC (rev 151756)
@@ -0,0 +1,25 @@
+# $Id$
+# Maintainer: Tobias Powalowski tp...@archlinux.org
+pkgname=cifs-utils
+pkgver=5.3
+pkgrel=2
+pkgdesc=CIFS filesystem user-space tools
+arch=(i686 x86_64)
+url=http://wiki.samba.org/index.php/LinuxCIFS_utils;
+license=('GPL')
+depends=('libcap-ng' 'keyutils' 'krb5' 'talloc' 'libwbclient')
+source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2)
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=$pkgdir install
+ # set mount.cifs uid, to enable none root mounting form fstab
+ chmod +s $pkgdir/sbin/mount.cifs
+}
+md5sums=('e1a428558a96d2d28ccdaacdc47ea0b7')
[arch-commits] Commit in nfs-utils/trunk (5 files)
Date: Friday, March 2, 2012 @ 04:08:07
Author: tpowa
Revision: 151757
upgpkg: nfs-utils 1.2.5-2
fix 28044
Modified:
nfs-utils/trunk/PKGBUILD
nfs-utils/trunk/nfs-server.conf
Deleted:
nfs-utils/trunk/nfs-utils-1.1.2-kerberos-ac.patch
nfs-utils/trunk/nfs-utils-1.1.6-heimdal_functions.patch
nfs-utils/trunk/nfs-utils-1.1.6-no_libgssapi.patch
-+
PKGBUILD|4
nfs-server.conf |2
nfs-utils-1.1.2-kerberos-ac.patch | 138 --
nfs-utils-1.1.6-heimdal_functions.patch | 69 ---
nfs-utils-1.1.6-no_libgssapi.patch | 57
5 files changed, 3 insertions(+), 267 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-02 08:44:51 UTC (rev 151756)
+++ PKGBUILD2012-03-02 09:08:07 UTC (rev 151757)
@@ -7,7 +7,7 @@
pkgname=nfs-utils
pkgver=1.2.5
-pkgrel=1
+pkgrel=2
pkgdesc=Support programs for Network File Systems
arch=('i686' 'x86_64')
url='http://nfs.sourceforge.net'
@@ -30,7 +30,7 @@
'dd0d65fc6e8f422fa12520813098264b'
'f73f197a16b02c3e248488ec35c4cf43'
'e619f18354ff958ed624d05d08853d8f'
- '2bf71def3263325643a09458635520f0'
+ '9cef69bc686cc5dcac23fbb51450747d'
'ff585faf410a62c4333a027c50b56bae'
'eb4f4027fab6fc1201f1ca04f5954c76'
'e9144277a89a620d9bc80413158a7d27'
Modified: nfs-server.conf
===
--- nfs-server.conf 2012-03-02 08:44:51 UTC (rev 151756)
+++ nfs-server.conf 2012-03-02 09:08:07 UTC (rev 151757)
@@ -18,7 +18,7 @@
# If you have a port-based firewall, you might want to set up
# a fixed port here using the --port option.
# See rpc.mountd(8) for more details.
-MOUNTD_OPTS=--no-nfs-version 2
+MOUNTD_OPTS=
# Do you want to start the svcgssd daemon? It is only required for Kerberos
# exports. Valid alternatives are yes and no; the default is no.
Deleted: nfs-utils-1.1.2-kerberos-ac.patch
===
--- nfs-utils-1.1.2-kerberos-ac.patch 2012-03-02 08:44:51 UTC (rev 151756)
+++ nfs-utils-1.1.2-kerberos-ac.patch 2012-03-02 09:08:07 UTC (rev 151757)
@@ -1,138 +0,0 @@
-diff -NaurwB nfs-utils-1.1.2.orig/aclocal/kerberos5.m4
nfs-utils-1.1.2/aclocal/kerberos5.m4
nfs-utils-1.1.2.orig/aclocal/kerberos5.m4 2008-03-14 16:46:29.0
+0100
-+++ nfs-utils-1.1.2/aclocal/kerberos5.m4 2008-06-12 17:13:51.0
+0200
-@@ -1,112 +1,48 @@
--dnl Checks for Kerberos
--dnl NOTE: while we intend to do generic gss-api, currently we
--dnl have a requirement to get an initial Kerberos machine
--dnl credential. Thus, the requirement for Kerberos.
--dnl The Kerberos gssapi library will be dynamically loaded?
- AC_DEFUN([AC_KERBEROS_V5],[
-+ K5CONFIG=krb5-config
- AC_MSG_CHECKING(for Kerberos v5)
-- AC_ARG_WITH(krb5,
-- [AC_HELP_STRING([--with-krb5=DIR], [use Kerberos v5 installation in DIR])],
-+ AC_ARG_WITH(krb5-config,
-+ [AC_HELP_STRING([--with-krb5-config=PATH], [Full Path to krb5-config.])],
- [ case $withval in
- yes|no)
-- krb5_with=
-+ K5CONFIG=krb5-config
-;;
- *)
-- krb5_with=$withval
-+ K5CONFIG=$withval
-;;
- esac ]
- )
-
-- for dir in $krb5_with /usr /usr/kerberos /usr/local /usr/local/krb5 \
-- /usr/krb5 /usr/heimdal /usr/local/heimdal /usr/athena ; do
--dnl This ugly hack brought on by the split installation of
--dnl MIT Kerberos on Fedora Core 1
--K5CONFIG=
--if test -f $dir/bin/krb5-config; then
-- K5CONFIG=$dir/bin/krb5-config
--elif test -f /usr/kerberos/bin/krb5-config; then
-- K5CONFIG=/usr/kerberos/bin/krb5-config
--elif test -f /usr/lib/mit/bin/krb5-config; then
-- K5CONFIG=/usr/lib/mit/bin/krb5-config
--fi
- if test $K5CONFIG != ; then
- KRBCFLAGS=`$K5CONFIG --cflags`
- KRBLIBS=`$K5CONFIG --libs gssapi`
-- K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(4),v,.); if
(v@:@3@:@ == ) v@:@3@:@ = 0; print
v@:@1@:@v@:@2@:@v@:@3@:@ }'`
-- AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos
version number])
-- if test -f $dir/include/gssapi/gssapi_krb5.h -a \
--\( -f $dir/lib/libgssapi_krb5.a -o \
-- -f $dir/lib64/libgssapi_krb5.a -o \
-- -f $dir/lib64/libgssapi_krb5.so -o \
-- -f $dir/lib/libgssapi_krb5.so \) ; then
-+if $K5CONFIG --version | grep -q -e heimdal; then
-+ K5VERS=`$K5CONFIG --version | head -n 1 | cut -f2 -d ' ' | tr -d '.'`
-+ AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos
libraries])
-+ gssapi_lib=gssapi
-+ KRBIMPL=heimdal
-+elif $K5CONFIG --version | grep -q -e mit; then
-+ K5VERS=`$K5CONFIG --version | head -n 1 |
[arch-commits] Commit in nfs-utils/repos (26 files)
Date: Friday, March 2, 2012 @ 04:09:32 Author: tpowa Revision: 151758 archrelease: copy trunk to testing-i686, testing-x86_64 Added: nfs-utils/repos/testing-i686/ nfs-utils/repos/testing-i686/PKGBUILD (from rev 151757, nfs-utils/trunk/PKGBUILD) nfs-utils/repos/testing-i686/exports (from rev 151757, nfs-utils/trunk/exports) nfs-utils/repos/testing-i686/idmapd.conf (from rev 151757, nfs-utils/trunk/idmapd.conf) nfs-utils/repos/testing-i686/kernel-3.0-segfault.patch (from rev 151757, nfs-utils/trunk/kernel-3.0-segfault.patch) nfs-utils/repos/testing-i686/nfs-common (from rev 151757, nfs-utils/trunk/nfs-common) nfs-utils/repos/testing-i686/nfs-common.conf (from rev 151757, nfs-utils/trunk/nfs-common.conf) nfs-utils/repos/testing-i686/nfs-server (from rev 151757, nfs-utils/trunk/nfs-server) nfs-utils/repos/testing-i686/nfs-server.conf (from rev 151757, nfs-utils/trunk/nfs-server.conf) nfs-utils/repos/testing-i686/nfs-utils-1.1.4-mtab-sym.patch (from rev 151757, nfs-utils/trunk/nfs-utils-1.1.4-mtab-sym.patch) nfs-utils/repos/testing-i686/nfs-utils-1.1.4-no-exec.patch (from rev 151757, nfs-utils/trunk/nfs-utils-1.1.4-no-exec.patch) nfs-utils/repos/testing-i686/nfs-utils.install (from rev 151757, nfs-utils/trunk/nfs-utils.install) nfs-utils/repos/testing-i686/start-statd.patch (from rev 151757, nfs-utils/trunk/start-statd.patch) nfs-utils/repos/testing-x86_64/ nfs-utils/repos/testing-x86_64/PKGBUILD (from rev 151757, nfs-utils/trunk/PKGBUILD) nfs-utils/repos/testing-x86_64/exports (from rev 151757, nfs-utils/trunk/exports) nfs-utils/repos/testing-x86_64/idmapd.conf (from rev 151757, nfs-utils/trunk/idmapd.conf) nfs-utils/repos/testing-x86_64/kernel-3.0-segfault.patch (from rev 151757, nfs-utils/trunk/kernel-3.0-segfault.patch) nfs-utils/repos/testing-x86_64/nfs-common (from rev 151757, nfs-utils/trunk/nfs-common) nfs-utils/repos/testing-x86_64/nfs-common.conf (from rev 151757, nfs-utils/trunk/nfs-common.conf) nfs-utils/repos/testing-x86_64/nfs-server (from rev 151757, nfs-utils/trunk/nfs-server) nfs-utils/repos/testing-x86_64/nfs-server.conf (from rev 151757, nfs-utils/trunk/nfs-server.conf) nfs-utils/repos/testing-x86_64/nfs-utils-1.1.4-mtab-sym.patch (from rev 151757, nfs-utils/trunk/nfs-utils-1.1.4-mtab-sym.patch) nfs-utils/repos/testing-x86_64/nfs-utils-1.1.4-no-exec.patch (from rev 151757, nfs-utils/trunk/nfs-utils-1.1.4-no-exec.patch) nfs-utils/repos/testing-x86_64/nfs-utils.install (from rev 151757, nfs-utils/trunk/nfs-utils.install) nfs-utils/repos/testing-x86_64/start-statd.patch (from rev 151757, nfs-utils/trunk/start-statd.patch) ---+ testing-i686/PKGBUILD | 73 + testing-i686/exports | 15 + testing-i686/idmapd.conf | 14 + testing-i686/kernel-3.0-segfault.patch| 53 testing-i686/nfs-common | 315 testing-i686/nfs-common.conf | 40 +++ testing-i686/nfs-server | 299 ++ testing-i686/nfs-server.conf | 29 ++ testing-i686/nfs-utils-1.1.4-mtab-sym.patch | 39 ++ testing-i686/nfs-utils-1.1.4-no-exec.patch| 15 + testing-i686/nfs-utils.install| 32 ++ testing-i686/start-statd.patch| 22 + testing-x86_64/PKGBUILD | 73 + testing-x86_64/exports| 15 + testing-x86_64/idmapd.conf| 14 + testing-x86_64/kernel-3.0-segfault.patch | 53 testing-x86_64/nfs-common | 315 testing-x86_64/nfs-common.conf| 40 +++ testing-x86_64/nfs-server | 299 ++ testing-x86_64/nfs-server.conf| 29 ++ testing-x86_64/nfs-utils-1.1.4-mtab-sym.patch | 39 ++ testing-x86_64/nfs-utils-1.1.4-no-exec.patch | 15 + testing-x86_64/nfs-utils.install | 32 ++ testing-x86_64/start-statd.patch | 22 + 24 files changed, 1892 insertions(+) The diff is longer than the limit of 200KB. Use svn diff -r 151757:151758 to see the changes.
[arch-commits] Commit in tftp-hpa/trunk (2 files)
Date: Friday, March 2, 2012 @ 04:20:09
Author: tpowa
Revision: 151759
upgpkg: tftp-hpa 5.2-2
fix 28103
Added:
tftp-hpa/trunk/tftp-hpa-0.49-fortify-strcpy-crash.patch
Modified:
tftp-hpa/trunk/PKGBUILD
--+
PKGBUILD | 13 ++---
tftp-hpa-0.49-fortify-strcpy-crash.patch | 26 ++
2 files changed, 36 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-02 09:09:32 UTC (rev 151758)
+++ PKGBUILD2012-03-02 09:20:09 UTC (rev 151759)
@@ -3,7 +3,7 @@
# Contributor: Jose Javier joj...@terra.es
pkgname=tftp-hpa
pkgver=5.2
-pkgrel=1
+pkgrel=2
pkgdesc=Official tftp server
arch=('i686' 'x86_64')
url=http://www.kernel.org/pub/software/network/tftp/;
@@ -11,10 +11,16 @@
depends=('readline=6.0.00')
conflicts=('netkit-tftp')
backup=('etc/conf.d/tftpd')
-source=(http://www.kernel.org/pub/software/network/tftp/tftp-hpa/$pkgname-$pkgver.tar.gz
tftpd.rc tftpd.conf LICENSE)
+source=(http://www.kernel.org/pub/software/network/tftp/tftp-hpa/$pkgname-$pkgver.tar.gz
+ tftpd.rc
+ tftpd.conf
+ LICENSE
+ tftp-hpa-0.49-fortify-strcpy-crash.patch)
build() {
cd ${srcdir}/${pkgname}-${pkgver}
+ # fix #28103
+ patch -Np1 -i ../tftp-hpa-0.49-fortify-strcpy-crash.patch
./configure --prefix=/usr --mandir=/usr/share/man --without-tcpwrappers
make
}
@@ -32,4 +38,5 @@
md5sums=('3de3038e7c2bf6fc5d496825893ac8e7'
'83fbb6f52205d95951a3c059e5351ca2'
'414a79dc891bced056d99a9bb790fc9e'
- '6ce21e27b6fdc1a1adf85c81e42aeecf')
+ '6ce21e27b6fdc1a1adf85c81e42aeecf'
+ '22e8629ef19bc276a102c5d4d284c1bd')
Added: tftp-hpa-0.49-fortify-strcpy-crash.patch
===
--- tftp-hpa-0.49-fortify-strcpy-crash.patch(rev 0)
+++ tftp-hpa-0.49-fortify-strcpy-crash.patch2012-03-02 09:20:09 UTC (rev
151759)
@@ -0,0 +1,26 @@
+diff -urN tftp-hpa-0.49.orig/tftp/tftp.c tftp-hpa-0.49/tftp/tftp.c
+--- tftp-hpa-0.49.orig/tftp/tftp.c 2008-10-20 18:08:31.0 -0400
tftp-hpa-0.49/tftp/tftp.c 2009-08-05 09:47:18.072585848 -0400
+@@ -279,15 +279,16 @@
+ struct tftphdr *tp, const char *mode)
+ {
+ char *cp;
++size_t len;
+
+ tp-th_opcode = htons((u_short) request);
+ cp = (char *)(tp-th_stuff);
+-strcpy(cp, name);
+-cp += strlen(name);
+-*cp++ = '\0';
+-strcpy(cp, mode);
+-cp += strlen(mode);
+-*cp++ = '\0';
++len = strlen(name) + 1;
++memcpy(cp, name, len);
++cp += len;
++len = strlen(mode) + 1;
++memcpy(cp, mode, len);
++cp += len;
+ return (cp - (char *)tp);
+ }
+
[arch-commits] Commit in tftp-hpa/repos (18 files)
Date: Friday, March 2, 2012 @ 04:20:56 Author: tpowa Revision: 151760 archrelease: copy trunk to extra-i686, extra-x86_64 Added: tftp-hpa/repos/extra-i686/LICENSE (from rev 151759, tftp-hpa/trunk/LICENSE) tftp-hpa/repos/extra-i686/PKGBUILD (from rev 151759, tftp-hpa/trunk/PKGBUILD) tftp-hpa/repos/extra-i686/tftp-hpa-0.49-fortify-strcpy-crash.patch (from rev 151759, tftp-hpa/trunk/tftp-hpa-0.49-fortify-strcpy-crash.patch) tftp-hpa/repos/extra-i686/tftpd.conf (from rev 151759, tftp-hpa/trunk/tftpd.conf) tftp-hpa/repos/extra-i686/tftpd.rc (from rev 151759, tftp-hpa/trunk/tftpd.rc) tftp-hpa/repos/extra-x86_64/LICENSE (from rev 151759, tftp-hpa/trunk/LICENSE) tftp-hpa/repos/extra-x86_64/PKGBUILD (from rev 151759, tftp-hpa/trunk/PKGBUILD) tftp-hpa/repos/extra-x86_64/tftp-hpa-0.49-fortify-strcpy-crash.patch (from rev 151759, tftp-hpa/trunk/tftp-hpa-0.49-fortify-strcpy-crash.patch) tftp-hpa/repos/extra-x86_64/tftpd.conf (from rev 151759, tftp-hpa/trunk/tftpd.conf) tftp-hpa/repos/extra-x86_64/tftpd.rc (from rev 151759, tftp-hpa/trunk/tftpd.rc) Deleted: tftp-hpa/repos/extra-i686/LICENSE tftp-hpa/repos/extra-i686/PKGBUILD tftp-hpa/repos/extra-i686/tftpd.conf tftp-hpa/repos/extra-i686/tftpd.rc tftp-hpa/repos/extra-x86_64/LICENSE tftp-hpa/repos/extra-x86_64/PKGBUILD tftp-hpa/repos/extra-x86_64/tftpd.conf tftp-hpa/repos/extra-x86_64/tftpd.rc ---+ extra-i686/LICENSE| 64 ++--- extra-i686/PKGBUILD | 77 extra-i686/tftp-hpa-0.49-fortify-strcpy-crash.patch | 26 + extra-i686/tftpd.conf |8 - extra-i686/tftpd.rc | 76 +++ extra-x86_64/LICENSE | 64 ++--- extra-x86_64/PKGBUILD | 77 extra-x86_64/tftp-hpa-0.49-fortify-strcpy-crash.patch | 26 + extra-x86_64/tftpd.conf |8 - extra-x86_64/tftpd.rc | 76 +++ 10 files changed, 284 insertions(+), 218 deletions(-) Deleted: extra-i686/LICENSE === --- extra-i686/LICENSE 2012-03-02 09:20:09 UTC (rev 151759) +++ extra-i686/LICENSE 2012-03-02 09:20:56 UTC (rev 151760) @@ -1,32 +0,0 @@ -/* - * Copyright (c) 1983, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in the - *documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - *may be used to endorse or promote products derived from this software - *without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ Copied: tftp-hpa/repos/extra-i686/LICENSE (from rev 151759, tftp-hpa/trunk/LICENSE) === --- extra-i686/LICENSE (rev 0) +++ extra-i686/LICENSE 2012-03-02 09:20:56 UTC (rev 151760) @@ -0,0 +1,32 @@ +/* + * Copyright (c) 1983, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain
[arch-commits] Commit in sudo/trunk (PKGBUILD)
Date: Friday, March 2, 2012 @ 05:57:42
Author: allan
Revision: 151761
upgpkg: sudo 1.8.4.p2-1
upstream update
Modified:
sudo/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-02 09:20:56 UTC (rev 151760)
+++ PKGBUILD2012-03-02 10:57:42 UTC (rev 151761)
@@ -3,7 +3,7 @@
# Contributor: Tom Newsom jeeps...@gmx.co.uk
pkgname=sudo
-_ver=1.8.4p1
+_ver=1.8.4p2
pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
pkgrel=1
pkgdesc=Give certain users the ability to run some commands as root
@@ -15,8 +15,8 @@
options=('!libtool' '!makeflags')
source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz{,.sig}
sudo.pam)
-md5sums=('d7f9bf7675bbc6d75e6f9353a175317c'
- '51bc933d386af08038349dd61aa243c3'
+md5sums=('c0cc9334246d4f34128660b6c5463e94'
+ 'bb692de8ecb24d8bfab00c45292536c5'
'4e7ad4ec8f2fe6a40e12bcb2c0b256e3')
build() {
[arch-commits] Commit in sudo/repos (6 files)
Date: Friday, March 2, 2012 @ 05:58:36
Author: allan
Revision: 151762
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
sudo/repos/testing-i686/
sudo/repos/testing-i686/PKGBUILD
(from rev 151761, sudo/trunk/PKGBUILD)
sudo/repos/testing-i686/sudo.pam
(from rev 151761, sudo/trunk/sudo.pam)
sudo/repos/testing-x86_64/
sudo/repos/testing-x86_64/PKGBUILD
(from rev 151761, sudo/trunk/PKGBUILD)
sudo/repos/testing-x86_64/sudo.pam
(from rev 151761, sudo/trunk/sudo.pam)
-+
testing-i686/PKGBUILD | 42 ++
testing-i686/sudo.pam |3 +++
testing-x86_64/PKGBUILD | 42 ++
testing-x86_64/sudo.pam |3 +++
4 files changed, 90 insertions(+)
Copied: sudo/repos/testing-i686/PKGBUILD (from rev 151761, sudo/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-03-02 10:58:36 UTC (rev 151762)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Allan McRae al...@archlinux.org
+# Contributor: Tom Newsom jeeps...@gmx.co.uk
+
+pkgname=sudo
+_ver=1.8.4p2
+pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
+pkgrel=1
+pkgdesc=Give certain users the ability to run some commands as root
+arch=('i686' 'x86_64')
+url=http://www.sudo.ws/sudo/;
+license=('custom')
+depends=('glibc' 'pam')
+backup=('etc/sudoers' 'etc/pam.d/sudo')
+options=('!libtool' '!makeflags')
+source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz{,.sig}
+sudo.pam)
+md5sums=('c0cc9334246d4f34128660b6c5463e94'
+ 'bb692de8ecb24d8bfab00c45292536c5'
+ '4e7ad4ec8f2fe6a40e12bcb2c0b256e3')
+
+build() {
+ cd $srcdir/$pkgname-$_ver
+
+ ./configure --prefix=/usr --with-pam --libexecdir=/usr/lib \
+--with-env-editor --with-all-insults --with-logfac=auth
+ make
+}
+
+check() {
+ cd $srcdir/$pkgname-$_ver
+ make check
+}
+
+package() {
+ cd $srcdir/$pkgname-$_ver
+ make DESTDIR=$pkgdir install
+
+ install -Dm644 $srcdir/sudo.pam $pkgdir/etc/pam.d/sudo
+
+ install -Dm644 doc/LICENSE $pkgdir/usr/share/licenses/sudo/LICENSE
+}
Copied: sudo/repos/testing-i686/sudo.pam (from rev 151761, sudo/trunk/sudo.pam)
===
--- testing-i686/sudo.pam (rev 0)
+++ testing-i686/sudo.pam 2012-03-02 10:58:36 UTC (rev 151762)
@@ -0,0 +1,3 @@
+#%PAM-1.0
+auth requiredpam_unix.so
+auth requiredpam_nologin.so
Copied: sudo/repos/testing-x86_64/PKGBUILD (from rev 151761,
sudo/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-03-02 10:58:36 UTC (rev 151762)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Allan McRae al...@archlinux.org
+# Contributor: Tom Newsom jeeps...@gmx.co.uk
+
+pkgname=sudo
+_ver=1.8.4p2
+pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
+pkgrel=1
+pkgdesc=Give certain users the ability to run some commands as root
+arch=('i686' 'x86_64')
+url=http://www.sudo.ws/sudo/;
+license=('custom')
+depends=('glibc' 'pam')
+backup=('etc/sudoers' 'etc/pam.d/sudo')
+options=('!libtool' '!makeflags')
+source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz{,.sig}
+sudo.pam)
+md5sums=('c0cc9334246d4f34128660b6c5463e94'
+ 'bb692de8ecb24d8bfab00c45292536c5'
+ '4e7ad4ec8f2fe6a40e12bcb2c0b256e3')
+
+build() {
+ cd $srcdir/$pkgname-$_ver
+
+ ./configure --prefix=/usr --with-pam --libexecdir=/usr/lib \
+--with-env-editor --with-all-insults --with-logfac=auth
+ make
+}
+
+check() {
+ cd $srcdir/$pkgname-$_ver
+ make check
+}
+
+package() {
+ cd $srcdir/$pkgname-$_ver
+ make DESTDIR=$pkgdir install
+
+ install -Dm644 $srcdir/sudo.pam $pkgdir/etc/pam.d/sudo
+
+ install -Dm644 doc/LICENSE $pkgdir/usr/share/licenses/sudo/LICENSE
+}
Copied: sudo/repos/testing-x86_64/sudo.pam (from rev 151761,
sudo/trunk/sudo.pam)
===
--- testing-x86_64/sudo.pam (rev 0)
+++ testing-x86_64/sudo.pam 2012-03-02 10:58:36 UTC (rev 151762)
@@ -0,0 +1,3 @@
+#%PAM-1.0
+auth requiredpam_unix.so
+auth requiredpam_nologin.so
[arch-commits] Commit in grep/trunk (PKGBUILD)
Date: Friday, March 2, 2012 @ 06:03:29
Author: allan
Revision: 151763
upgpkg: grep 2.11-1
upstream update
Modified:
grep/trunk/PKGBUILD
--+
PKGBUILD |8
1 file changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-02 10:58:36 UTC (rev 151762)
+++ PKGBUILD2012-03-02 11:03:29 UTC (rev 151763)
@@ -3,8 +3,8 @@
# Contributor: judd jvi...@zeroflux.org
pkgname=grep
-pkgver=2.10
-pkgrel=3
+pkgver=2.11
+pkgrel=1
pkgdesc=A string search utility
arch=('i686' 'x86_64')
license=('GPL3')
@@ -14,8 +14,8 @@
makedepends=('texinfo')
install=${pkgname}.install
source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
-md5sums=('709915434d09f5db655e5ebd7fd6bb7f'
- '9ad5c390a6ad7f566c58db28ddb06aed')
+md5sums=('ad9c6dbdeab93e50d2bc380f10ed3643'
+ 'e4fea5e355973c951f93f48bc86f92fa')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
[arch-commits] Commit in grep/repos (6 files)
Date: Friday, March 2, 2012 @ 06:04:18
Author: allan
Revision: 151764
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
grep/repos/testing-i686/
grep/repos/testing-i686/PKGBUILD
(from rev 151763, grep/trunk/PKGBUILD)
grep/repos/testing-i686/grep.install
(from rev 151763, grep/trunk/grep.install)
grep/repos/testing-x86_64/
grep/repos/testing-x86_64/PKGBUILD
(from rev 151763, grep/trunk/PKGBUILD)
grep/repos/testing-x86_64/grep.install
(from rev 151763, grep/trunk/grep.install)
-+
testing-i686/PKGBUILD | 37 +
testing-i686/grep.install | 21 +
testing-x86_64/PKGBUILD | 37 +
testing-x86_64/grep.install | 21 +
4 files changed, 116 insertions(+)
Copied: grep/repos/testing-i686/PKGBUILD (from rev 151763, grep/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-03-02 11:04:18 UTC (rev 151764)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Allan McRae al...@archlinux.org
+# Contributor: judd jvi...@zeroflux.org
+
+pkgname=grep
+pkgver=2.11
+pkgrel=1
+pkgdesc=A string search utility
+arch=('i686' 'x86_64')
+license=('GPL3')
+url=http://www.gnu.org/software/grep/grep.html;
+groups=('base')
+depends=('glibc' 'pcre' 'sh')
+makedepends=('texinfo')
+install=${pkgname}.install
+source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
+md5sums=('ad9c6dbdeab93e50d2bc380f10ed3643'
+ 'e4fea5e355973c951f93f48bc86f92fa')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./configure --prefix=/usr --without-included-regex
+ make
+}
+
+check() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make check
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+
+ install -dm755 ${pkgdir}/bin
+ ln -s /usr/bin/grep ${pkgdir}/bin/grep
+}
Copied: grep/repos/testing-i686/grep.install (from rev 151763,
grep/trunk/grep.install)
===
--- testing-i686/grep.install (rev 0)
+++ testing-i686/grep.install 2012-03-02 11:04:18 UTC (rev 151764)
@@ -0,0 +1,21 @@
+infodir=usr/share/info
+filelist=(grep.info)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+install-info $infodir/$file.gz $infodir/dir 2 /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+install-info --delete $infodir/$file.gz $infodir/dir 2 /dev/null
+ done
+}
+
Copied: grep/repos/testing-x86_64/PKGBUILD (from rev 151763,
grep/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-03-02 11:04:18 UTC (rev 151764)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Allan McRae al...@archlinux.org
+# Contributor: judd jvi...@zeroflux.org
+
+pkgname=grep
+pkgver=2.11
+pkgrel=1
+pkgdesc=A string search utility
+arch=('i686' 'x86_64')
+license=('GPL3')
+url=http://www.gnu.org/software/grep/grep.html;
+groups=('base')
+depends=('glibc' 'pcre' 'sh')
+makedepends=('texinfo')
+install=${pkgname}.install
+source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
+md5sums=('ad9c6dbdeab93e50d2bc380f10ed3643'
+ 'e4fea5e355973c951f93f48bc86f92fa')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./configure --prefix=/usr --without-included-regex
+ make
+}
+
+check() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make check
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+
+ install -dm755 ${pkgdir}/bin
+ ln -s /usr/bin/grep ${pkgdir}/bin/grep
+}
Copied: grep/repos/testing-x86_64/grep.install (from rev 151763,
grep/trunk/grep.install)
===
--- testing-x86_64/grep.install (rev 0)
+++ testing-x86_64/grep.install 2012-03-02 11:04:18 UTC (rev 151764)
@@ -0,0 +1,21 @@
+infodir=usr/share/info
+filelist=(grep.info)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+install-info $infodir/$file.gz $infodir/dir 2 /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+install-info --delete $infodir/$file.gz $infodir/dir 2 /dev/null
+ done
+}
+
[arch-commits] Commit in mercurial/trunk (PKGBUILD mercurial-2.1-return-code.patch)
Date: Friday, March 2, 2012 @ 06:44:29
Author: giovanni
Revision: 151765
upgpkg: mercurial 2.1.1-1
upstream release
Modified:
mercurial/trunk/PKGBUILD
Deleted:
mercurial/trunk/mercurial-2.1-return-code.patch
-+
PKGBUILD| 14 -
mercurial-2.1-return-code.patch | 377 --
2 files changed, 6 insertions(+), 385 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-02 11:04:18 UTC (rev 151764)
+++ PKGBUILD2012-03-02 11:44:29 UTC (rev 151765)
@@ -3,8 +3,8 @@
# Contributor: Douglas Soares de Andrade doug...@archlinux.org
pkgname=mercurial
-pkgver=2.1
-pkgrel=2
+pkgver=2.1.1
+pkgrel=1
pkgdesc=A scalable distributed SCM tool
arch=('i686' 'x86_64')
url=http://mercurial.selenic.com/;
@@ -13,15 +13,13 @@
optdepends=('tk: for the hgk GUI')
backup=('etc/mercurial/hgrc')
source=(http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz;
-'mercurial.profile'
-'mercurial-2.1-return-code.patch')
-md5sums=('d2ca44f8d0129ab50639143af99d9363'
- '43e1d36564d4c7fbe9a091d3ea370a44'
- '025e2ec8acc18a9b2a1b4f51f7bddbe3')
+'mercurial.profile')
+md5sums=('368fab4705ebd4d1296fdd6bd2fe6272'
+ '43e1d36564d4c7fbe9a091d3ea370a44')
package() {
cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np1 -i ${srcdir}/mercurial-2.1-return-code.patch
+
python2 setup.py install --root=${pkgdir}/ --optimize=1
sed -i -e 's#env python#env python2#' \
Deleted: mercurial-2.1-return-code.patch
===
--- mercurial-2.1-return-code.patch 2012-03-02 11:04:18 UTC (rev 151764)
+++ mercurial-2.1-return-code.patch 2012-03-02 11:44:29 UTC (rev 151765)
@@ -1,377 +0,0 @@
-
-# HG changeset patch
-# User Matt Mackall m...@selenic.com
-# Date 1328911770 21600
-# Node ID a3dcc59054cac3a78d0d5e5402680b17a396d59e
-# Parent d75aa756149bfd54b1f7f84b86072b3c1a50d683
-pull: backout change to return code
-
-This bit a number of people.
-
-diff --git a/mercurial/commands.py b/mercurial/commands.py
a/mercurial/commands.py
-+++ b/mercurial/commands.py
-@@ -4261,7 +4261,7 @@
-
- def postincoming(ui, repo, modheads, optupdate, checkout):
- if modheads == 0:
--return 1
-+return
- if optupdate:
- movemarkfrom = repo['.'].node()
- try:
-@@ -4312,8 +4312,7 @@
- If SOURCE is omitted, the 'default' path will be used.
- See :hg:`help urls` for more information.
-
--Returns 0 on success, 1 if no changes found or an update had
--unresolved files.
-+Returns 0 on success, 1 if an update had unresolved files.
-
- source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
- other = hg.peer(repo, opts, source)
-diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t
a/tests/test-bookmarks-pushpull.t
-+++ b/tests/test-bookmarks-pushpull.t
-@@ -44,7 +44,6 @@
- pulling from ../a
- no changes found
- importing bookmark X
-- [1]
- $ hg bookmark
- X 0:4e3505fd9583
- Y 0:4e3505fd9583
-@@ -185,7 +184,6 @@
- no changes found
- divergent bookmark X stored as X@1
- importing bookmark Z
-- [1]
- $ hg clone http://localhost:$HGPORT/ cloned-bookmarks
- requesting all changes
- adding changesets
-diff --git a/tests/test-bundle.t b/tests/test-bundle.t
a/tests/test-bundle.t
-+++ b/tests/test-bundle.t
-@@ -85,7 +85,6 @@
- pulling from ../full.hg
- searching for changes
- no changes found
-- [1]
-
- Pull full.hg into empty (using --cwd)
-
-@@ -120,7 +119,6 @@
- pulling from full.hg
- searching for changes
- no changes found
-- [1]
-
- Pull full.hg into empty (using -R)
-
-@@ -128,7 +126,6 @@
- pulling from full.hg
- searching for changes
- no changes found
-- [1]
-
- Rollback empty
-
-diff --git a/tests/test-convert.t b/tests/test-convert.t
a/tests/test-convert.t
-+++ b/tests/test-convert.t
-@@ -293,7 +293,6 @@
- pulling from ../a
- searching for changes
- no changes found
-- [1]
- $ touch bogusfile
-
- should fail
-diff --git a/tests/test-hook.t b/tests/test-hook.t
a/tests/test-hook.t
-+++ b/tests/test-hook.t
-@@ -196,7 +196,6 @@
- listkeys hook: HG_NAMESPACE=phases
HG_VALUES={'cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b': '1', 'publishing':
'True'}
- listkeys hook: HG_NAMESPACE=bookmarks HG_VALUES={'bar':
'', 'foo':
''}
- importing bookmark bar
-- [1]
- $ cd ../a
-
- test that prepushkey can prevent incoming keys
-diff --git a/tests/test-https.t b/tests/test-https.t
a/tests/test-https.t
-+++ b/tests/test-https.t
-@@ -160,7 +160,6 @@
- pulling from https://localhost:$HGPORT/
- searching for changes
- no changes found
-- [1]
- $ mv
[arch-commits] Commit in mercurial/repos (10 files)
Date: Friday, March 2, 2012 @ 06:44:52
Author: giovanni
Revision: 151766
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
mercurial/repos/extra-i686/PKGBUILD
(from rev 151765, mercurial/trunk/PKGBUILD)
mercurial/repos/extra-i686/mercurial.profile
(from rev 151765, mercurial/trunk/mercurial.profile)
mercurial/repos/extra-x86_64/PKGBUILD
(from rev 151765, mercurial/trunk/PKGBUILD)
mercurial/repos/extra-x86_64/mercurial.profile
(from rev 151765, mercurial/trunk/mercurial.profile)
Deleted:
mercurial/repos/extra-i686/PKGBUILD
mercurial/repos/extra-i686/mercurial-2.1-return-code.patch
mercurial/repos/extra-i686/mercurial.profile
mercurial/repos/extra-x86_64/PKGBUILD
mercurial/repos/extra-x86_64/mercurial-2.1-return-code.patch
mercurial/repos/extra-x86_64/mercurial.profile
--+
extra-i686/PKGBUILD | 96 +++---
extra-i686/mercurial-2.1-return-code.patch | 377 -
extra-i686/mercurial.profile |2
extra-x86_64/PKGBUILD| 96 +++---
extra-x86_64/mercurial-2.1-return-code.patch | 377 -
extra-x86_64/mercurial.profile |2
6 files changed, 96 insertions(+), 854 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-03-02 11:44:29 UTC (rev 151765)
+++ extra-i686/PKGBUILD 2012-03-02 11:44:52 UTC (rev 151766)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Giovanni Scafora giova...@archlinux.org
-# Contributor: Douglas Soares de Andrade doug...@archlinux.org
-
-pkgname=mercurial
-pkgver=2.1
-pkgrel=2
-pkgdesc=A scalable distributed SCM tool
-arch=('i686' 'x86_64')
-url=http://mercurial.selenic.com/;
-license=('GPL')
-depends=('python2')
-optdepends=('tk: for the hgk GUI')
-backup=('etc/mercurial/hgrc')
-source=(http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz;
-'mercurial.profile'
-'mercurial-2.1-return-code.patch')
-md5sums=('d2ca44f8d0129ab50639143af99d9363'
- '43e1d36564d4c7fbe9a091d3ea370a44'
- '025e2ec8acc18a9b2a1b4f51f7bddbe3')
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np1 -i ${srcdir}/mercurial-2.1-return-code.patch
- python2 setup.py install --root=${pkgdir}/ --optimize=1
-
- sed -i -e 's#env python#env python2#' \
-${pkgdir}/usr/lib/python2.7/site-packages/mercurial/lsprof.py
-
- install -d ${pkgdir}/usr/share/man/{man1,man5}
- install -m644 doc/hg.1 ${pkgdir}/usr/share/man/man1
- install -m644 doc/{hgrc.5,hgignore.5} ${pkgdir}/usr/share/man/man5
- install -m755 contrib/hgk ${pkgdir}/usr/bin
- install -m644 -D contrib/zsh_completion
${pkgdir}/usr/share/zsh/site-functions/_hg
- install -m644 -D contrib/bash_completion ${pkgdir}/etc/bash_completion.d/hg
- install -d ${pkgdir}/usr/share/emacs/site-lisp
- install -m644 contrib/{mq.el,mercurial.el}
${pkgdir}/usr/share/emacs/site-lisp
-
- vimpath=${pkgdir}/usr/share/vim/vimfiles
- install -Dm644 contrib/vim/HGAnnotate.vim ${vimpath}/syntax/HGAnnotate.vim
-
- # set some variables
- install -m755 -d ${pkgdir}/etc/profile.d
- install -m755 ${srcdir}/mercurial.profile
${pkgdir}/etc/profile.d/mercurial.sh
-
- # install configuration file
- install -m755 -d ${pkgdir}/etc/mercurial
- install -m644 contrib/sample.hgrc ${pkgdir}/etc/mercurial/hgrc
-}
Copied: mercurial/repos/extra-i686/PKGBUILD (from rev 151765,
mercurial/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-03-02 11:44:52 UTC (rev 151766)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Giovanni Scafora giova...@archlinux.org
+# Contributor: Douglas Soares de Andrade doug...@archlinux.org
+
+pkgname=mercurial
+pkgver=2.1.1
+pkgrel=1
+pkgdesc=A scalable distributed SCM tool
+arch=('i686' 'x86_64')
+url=http://mercurial.selenic.com/;
+license=('GPL')
+depends=('python2')
+optdepends=('tk: for the hgk GUI')
+backup=('etc/mercurial/hgrc')
+source=(http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz;
+'mercurial.profile')
+md5sums=('368fab4705ebd4d1296fdd6bd2fe6272'
+ '43e1d36564d4c7fbe9a091d3ea370a44')
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ python2 setup.py install --root=${pkgdir}/ --optimize=1
+
+ sed -i -e 's#env python#env python2#' \
+${pkgdir}/usr/lib/python2.7/site-packages/mercurial/lsprof.py
+
+ install -d ${pkgdir}/usr/share/man/{man1,man5}
+ install -m644 doc/hg.1 ${pkgdir}/usr/share/man/man1
+ install -m644 doc/{hgrc.5,hgignore.5} ${pkgdir}/usr/share/man/man5
+ install -m755 contrib/hgk ${pkgdir}/usr/bin
+ install -m644 -D contrib/zsh_completion
${pkgdir}/usr/share/zsh/site-functions/_hg
+ install -m644 -D contrib/bash_completion ${pkgdir}/etc/bash_completion.d/hg
+ install -d ${pkgdir}/usr/share/emacs/site-lisp
+ install -m644
[arch-commits] Commit in syslinux/trunk (3 files)
Date: Friday, March 2, 2012 @ 07:51:50
Author: tpowa
Revision: 151767
upgpkg: syslinux 4.05-2
fix #22972 #25783 #27319 #28737
Modified:
syslinux/trunk/PKGBUILD
syslinux/trunk/syslinux-install_update
syslinux/trunk/syslinux.cfg
-+
PKGBUILD| 10 ++
syslinux-install_update | 20
syslinux.cfg|2 +-
3 files changed, 19 insertions(+), 13 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-02 11:44:52 UTC (rev 151766)
+++ PKGBUILD2012-03-02 12:51:50 UTC (rev 151767)
@@ -4,7 +4,7 @@
pkgname=syslinux
pkgver=4.05
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
pkgdesc=Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs
filesystems, from CDs and via PXE
url=http://syslinux.zytor.com/;
@@ -12,7 +12,7 @@
depends=('perl' 'glibc')
optdepends=('perl-passwd-md5: For md5pass'
'perl-digest-sha1: For sha1pass'
-'mtools: For mkdiskimage and syslinux'
+'mtools: For mkdiskimage and fat support'
)
makedepends=('nasm')
backup=('boot/syslinux/syslinux.cfg')
@@ -23,8 +23,8 @@
syslinux-install_update)
md5sums=('82299242418385da1274c9479a778cb2'
'1528c376e43f0eaccaa80d8ad1bc13b4'
- '4dc27d8ab3802f8e50f3dda28168ce6d'
- 'b5b4953c0a5a01cd16441402f6321765')
+ '832595501944fbcabcdc1207f4724fe7'
+ 'dd8a6a2104e64d8e4fee4f2d59ae223a')
build() {
# Do not try to build syslinux with our default LDFLAGS, it will fail
@@ -46,4 +46,6 @@
# Install the installation and update script
# This script is maintained at git://gist.github.com/772138.git
install -D -m755 $srcdir/syslinux-install_update
$pkgdir/usr/sbin/syslinux-install_update
+ # move extlinux binary to /usr/sbin
+ mv $pkgdir/sbin/extlinux $pkgdir/usr/sbin/extlinux
}
Modified: syslinux-install_update
===
--- syslinux-install_update 2012-03-02 11:44:52 UTC (rev 151766)
+++ syslinux-install_update 2012-03-02 12:51:50 UTC (rev 151767)
@@ -357,12 +357,6 @@
fi
}
-# Make sure only root can run our script
-if (( $(id -u) != 0 )); then
-echo This script must be run as root 12
-exit 1
-fi
-
if (( $# == 0 )); then
usage
exit 1
@@ -378,8 +372,7 @@
fi
;;
h)
-usage
-exit 0
+USAGE=True
;;
i)
INSTALL=True
@@ -408,6 +401,17 @@
esac
done
+if [[ $USAGE ]]; then
+usage
+exit 0
+fi
+
+# Make sure only root can run our script
+if (( $(id -u) != 0 )); then
+echo This script must be run as root 12
+exit 1
+fi
+
# Display Usage Information if both Install and Update are passed
if [[ $INSTALL $UPDATE ]]; then
usage
Modified: syslinux.cfg
===
--- syslinux.cfg2012-03-02 11:44:52 UTC (rev 151766)
+++ syslinux.cfg2012-03-02 12:51:50 UTC (rev 151767)
@@ -20,7 +20,7 @@
# The wiki provides further configuration examples
DEFAULT arch
-PROMPT 0# Change to 1 if you do not want to use a menu
+PROMPT 0# Set to 1 if you always want to display the boot: prompt
TIMEOUT 50
# You can create syslinux keymaps with the keytab-lilo tool
#KBDMAP de.ktl
[arch-commits] Commit in syslinux/repos (12 files)
Date: Friday, March 2, 2012 @ 07:52:32 Author: tpowa Revision: 151768 archrelease: copy trunk to extra-i686, extra-x86_64 Added: syslinux/repos/extra-i686/ syslinux/repos/extra-i686/PKGBUILD (from rev 151767, syslinux/trunk/PKGBUILD) syslinux/repos/extra-i686/syslinux-dont-build-dos-windows-targets.patch (from rev 151767, syslinux/trunk/syslinux-dont-build-dos-windows-targets.patch) syslinux/repos/extra-i686/syslinux-install_update (from rev 151767, syslinux/trunk/syslinux-install_update) syslinux/repos/extra-i686/syslinux.cfg (from rev 151767, syslinux/trunk/syslinux.cfg) syslinux/repos/extra-i686/syslinux.install (from rev 151767, syslinux/trunk/syslinux.install) syslinux/repos/extra-x86_64/ syslinux/repos/extra-x86_64/PKGBUILD (from rev 151767, syslinux/trunk/PKGBUILD) syslinux/repos/extra-x86_64/syslinux-dont-build-dos-windows-targets.patch (from rev 151767, syslinux/trunk/syslinux-dont-build-dos-windows-targets.patch) syslinux/repos/extra-x86_64/syslinux-install_update (from rev 151767, syslinux/trunk/syslinux-install_update) syslinux/repos/extra-x86_64/syslinux.cfg (from rev 151767, syslinux/trunk/syslinux.cfg) syslinux/repos/extra-x86_64/syslinux.install (from rev 151767, syslinux/trunk/syslinux.install) + extra-i686/PKGBUILD| 51 + extra-i686/syslinux-dont-build-dos-windows-targets.patch | 12 extra-i686/syslinux-install_update | 463 +++ extra-i686/syslinux.cfg| 79 + extra-i686/syslinux.install| 13 extra-x86_64/PKGBUILD | 51 + extra-x86_64/syslinux-dont-build-dos-windows-targets.patch | 12 extra-x86_64/syslinux-install_update | 463 +++ extra-x86_64/syslinux.cfg | 79 + extra-x86_64/syslinux.install | 13 10 files changed, 1236 insertions(+) The diff is longer than the limit of 200KB. Use svn diff -r 151767:151768 to see the changes.
[arch-commits] Commit in tzdata/trunk (PKGBUILD)
Date: Friday, March 2, 2012 @ 08:58:34
Author: andyrtr
Revision: 151769
upgpkg: tzdata 2012b-1
upstream update 2012b
Modified:
tzdata/trunk/PKGBUILD
--+
PKGBUILD | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-02 12:52:32 UTC (rev 151768)
+++ PKGBUILD2012-03-02 13:58:34 UTC (rev 151769)
@@ -2,10 +2,10 @@
# Maintainer: Andreas Radke andy...@archlinux.org
pkgname=tzdata
-pkgver=2011n
+pkgver=2012b
pkgrel=1
-_tzcode=2011i
-_tzdata=2011n
+_tzcode=2012b
+_tzdata=2012b
pkgdesc=Sources for time zone and daylight saving time data
arch=('i686' 'x86_64')
url=hhttp://www.iana.org/time-zones;
@@ -14,11 +14,13 @@
makedepends=()
optdepends=('bash: required by tzselect')
options=('!emptydirs')
-source=(http://www.iana.org/time-zones/repository/releases/tzcode${_tzcode}.tar.gz
-
http://www.iana.org/time-zones/repository/releases/${pkgname}${_tzdata}.tar.gz
+source=(#http://www.iana.org/time-zones/repository/releases/tzcode${_tzcode}.tar.gz
+ ftp://munnari.oz.au/pub/tzcode${_tzcode}.tar.gz
+
#http://www.iana.org/time-zones/repository/releases/${pkgname}${_tzdata}.tar.gz
+ftp://munnari.oz.au/pub/${pkgname}${_tzdata}.tar.gz
Makefile.patch)
-md5sums=('cf7f4335b7c8682899fa2814e711c1b2'
- '20dbfb28efa008ddbf6dd34601ea40fa'
+md5sums=('6137322ffd36e1fd5128885be1c57008'
+ '0615fd29def380a917e528433c820368'
'a64ed97d1fc03c66ee8612c0d9f40507')
build() {
[arch-commits] Commit in tzdata/repos (6 files)
Date: Friday, March 2, 2012 @ 08:59:06 Author: andyrtr Revision: 151770 archrelease: copy trunk to testing-i686, testing-x86_64 Added: tzdata/repos/testing-i686/ tzdata/repos/testing-i686/Makefile.patch (from rev 151769, tzdata/trunk/Makefile.patch) tzdata/repos/testing-i686/PKGBUILD (from rev 151769, tzdata/trunk/PKGBUILD) tzdata/repos/testing-x86_64/ tzdata/repos/testing-x86_64/Makefile.patch (from rev 151769, tzdata/trunk/Makefile.patch) tzdata/repos/testing-x86_64/PKGBUILD (from rev 151769, tzdata/trunk/PKGBUILD) ---+ testing-i686/Makefile.patch | 140 testing-i686/PKGBUILD | 47 + testing-x86_64/Makefile.patch | 140 testing-x86_64/PKGBUILD | 47 + 4 files changed, 374 insertions(+) Copied: tzdata/repos/testing-i686/Makefile.patch (from rev 151769, tzdata/trunk/Makefile.patch) === --- testing-i686/Makefile.patch (rev 0) +++ testing-i686/Makefile.patch 2012-03-02 13:59:06 UTC (rev 151770) @@ -0,0 +1,140 @@ +diff -Naur src/Makefile src-p/Makefile +--- src/Makefile 2007-08-20 16:47:41.0 +0200 src-p/Makefile 2007-10-02 04:07:44.0 +0200 +@@ -34,17 +34,17 @@ + + # Everything gets put in subdirectories of. . . + +-TOPDIR= /usr/local ++TOPDIR= $(DESTDIR)/usr + + # Compiled time zone information is placed in the TZDIR directory + # (and subdirectories). + # Use an absolute path name for TZDIR unless you're just testing the software. + +-TZDIR=$(TOPDIR)/etc/zoneinfo ++TZDIR=$(TOPDIR)/share/zoneinfo + + # The tzselect, zic, and zdump commands get installed in. . . + +-ETCDIR= $(TOPDIR)/etc ++SBINDIR= $(TOPDIR)/sbin + + # If you make INSTALL, the date command gets installed in. . . + +@@ -52,7 +52,7 @@ + + # Manual pages go in subdirectories of. . . + +-MANDIR= $(TOPDIR)/man ++MANDIR= $(TOPDIR)/share/man + + # Library functions are put in an archive in LIBDIR. + +@@ -83,7 +83,7 @@ + + # Non-default libraries needed to link. + # Add -lintl if you want to use `gettext' on Solaris. +-LDLIBS= ++LDLIBS=$(LDFLAGS) + + # Add the following to the end of the CFLAGS= line as needed. + # -Dconst= if `const' does not work (SunOS 4.x cc, OSF1 V5.0 cc) +@@ -211,7 +211,7 @@ + # before the first Monday in January when a %V format is used and January 1 + # falls on a Friday, Saturday, or Sunday. + +-CFLAGS= ++CFLAGS += -std=gnu99 + + # If you want zic's -s option used when installing, uncomment the next line + # ZFLAGS= -s +@@ -220,7 +220,7 @@ + ZIC= $(zic) $(ZFLAGS) + + # The name of a Posix-compliant `awk' on your system. +-AWK= nawk ++AWK= awk + + # The path where SGML DTDs are kept. + SGML_SEARCH_PATH= $(TOPDIR)/share/doc/sgml-lib/REC-html401-19991224/ +@@ -241,8 +241,10 @@ + + ### + +-cc= cc +-CC= $(cc) -DTZDIR=\$(TZDIR)\ ++CC+= -DTZDIR=\$(TZDIR)\ ++ifeq ($(NLS),1) ++CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\libc\ ++endif + + TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c + TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o +@@ -282,14 +284,16 @@ + + ALL: all date + +-install: all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA) ++install: all $(DATA) $(REDO) $(MANS) $(TABDATA) + $(ZIC) -y $(YEARISTYPE) \ + -d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) + -rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab + cp iso3166.tab zone.tab $(TZDIR)/. +- -mkdir $(TOPDIR) $(ETCDIR) +- cp tzselect zic zdump $(ETCDIR)/. +- -mkdir $(TOPDIR) $(MANDIR) \ ++ -mkdir -p $(TOPDIR) $(SBINDIR) ++ cp zic zdump $(SBINDIR)/. ++ -mkdir -p $(TOPDIR) $(BINDIR) ++ cp tzselect $(BINDIR)/. ++ -mkdir -p $(TOPDIR) $(MANDIR) \ + $(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8 + -rm -f $(MANDIR)/man3/newctime.3 \ + $(MANDIR)/man3/newtzset.3 \ +@@ -298,13 +302,11 @@ + $(MANDIR)/man8/zdump.8 \ + $(MANDIR)/man8/zic.8 + cp newctime.3 newtzset.3 $(MANDIR)/man3/. +- cp tzfile.5 $(MANDIR)/man5/. +- cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/. + + INSTALL: ALL install date.1 +- -mkdir $(TOPDIR) $(BINDIR) ++ -mkdir -p $(TOPDIR) $(BINDIR) + cp date $(BINDIR)/. +- -mkdir $(TOPDIR) $(MANDIR) $(MANDIR)/man1 ++ -mkdir -p $(TOPDIR) $(MANDIR) $(MANDIR)/man1 + -rm -f
[arch-commits] Commit in eclipse/trunk (eclipse.install)
Date: Friday, March 2, 2012 @ 09:01:44
Author: giovanni
Revision: 151771
Fixed a syntax error
Modified:
eclipse/trunk/eclipse.install
-+
eclipse.install |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: eclipse.install
===
--- eclipse.install 2012-03-02 13:59:06 UTC (rev 151770)
+++ eclipse.install 2012-03-02 14:01:44 UTC (rev 151771)
@@ -3,9 +3,9 @@
}
post_upgrade() {
- post_install $1
+ post_install
}
post_remove() {
- post-install $1
+ post_install
}
[arch-commits] Commit in inputproto/trunk (PKGBUILD)
Date: Friday, March 2, 2012 @ 09:23:25
Author: andyrtr
Revision: 151772
upgpkg: inputproto 2.2-1
upstream update 2.2
Modified:
inputproto/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-02 14:01:44 UTC (rev 151771)
+++ PKGBUILD2012-03-02 14:23:25 UTC (rev 151772)
@@ -2,7 +2,7 @@
# Maintainer: Jan de Groot j...@archlinux.org
pkgname=inputproto
-pkgver=2.1.99.6
+pkgver=2.2
pkgrel=1
pkgdesc=X11 Input extension wire protocol
arch=(any)
@@ -10,7 +10,7 @@
url=http://xorg.freedesktop.org/;
makedepends=('xorg-util-macros' 'asciidoc')
source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('36d5ff554c9edc6eb116f3f08d32cd2acd75e9b5')
+sha1sums=('500e0a6dac3523887c0b82753fe5e9d4bb982137')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
[arch-commits] Commit in inputproto/repos/testing-any (PKGBUILD PKGBUILD)
Date: Friday, March 2, 2012 @ 09:23:50
Author: andyrtr
Revision: 151773
archrelease: copy trunk to testing-any
Added:
inputproto/repos/testing-any/PKGBUILD
(from rev 151772, inputproto/trunk/PKGBUILD)
Deleted:
inputproto/repos/testing-any/PKGBUILD
--+
PKGBUILD | 54 +++---
1 file changed, 27 insertions(+), 27 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2012-03-02 14:23:25 UTC (rev 151772)
+++ PKGBUILD2012-03-02 14:23:50 UTC (rev 151773)
@@ -1,27 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=inputproto
-pkgver=2.1.99.6
-pkgrel=1
-pkgdesc=X11 Input extension wire protocol
-arch=(any)
-license=('custom')
-url=http://xorg.freedesktop.org/;
-makedepends=('xorg-util-macros' 'asciidoc')
-source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('36d5ff554c9edc6eb116f3f08d32cd2acd75e9b5')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-
- install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
- install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
-}
Copied: inputproto/repos/testing-any/PKGBUILD (from rev 151772,
inputproto/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2012-03-02 14:23:50 UTC (rev 151773)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=inputproto
+pkgver=2.2
+pkgrel=1
+pkgdesc=X11 Input extension wire protocol
+arch=(any)
+license=('custom')
+url=http://xorg.freedesktop.org/;
+makedepends=('xorg-util-macros' 'asciidoc')
+source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('500e0a6dac3523887c0b82753fe5e9d4bb982137')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+
+ install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+ install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}
[arch-commits] Commit in tzdata/trunk (PKGBUILD)
Date: Friday, March 2, 2012 @ 09:24:32
Author: andyrtr
Revision: 151774
fix url
Modified:
tzdata/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-02 14:23:50 UTC (rev 151773)
+++ PKGBUILD2012-03-02 14:24:32 UTC (rev 151774)
@@ -8,7 +8,7 @@
_tzdata=2012b
pkgdesc=Sources for time zone and daylight saving time data
arch=('i686' 'x86_64')
-url=hhttp://www.iana.org/time-zones;
+url=http://www.iana.org/time-zones;
license=('GPL')
depends=()
makedepends=()
[arch-commits] Commit in tzdata/repos/testing-x86_64 (4 files)
Date: Friday, March 2, 2012 @ 09:25:01 Author: andyrtr Revision: 151775 archrelease: copy trunk to testing-x86_64 Added: tzdata/repos/testing-x86_64/Makefile.patch (from rev 151774, tzdata/trunk/Makefile.patch) tzdata/repos/testing-x86_64/PKGBUILD (from rev 151774, tzdata/trunk/PKGBUILD) Deleted: tzdata/repos/testing-x86_64/Makefile.patch tzdata/repos/testing-x86_64/PKGBUILD + Makefile.patch | 280 +++ PKGBUILD | 94 +- 2 files changed, 187 insertions(+), 187 deletions(-) Deleted: Makefile.patch === --- Makefile.patch 2012-03-02 14:24:32 UTC (rev 151774) +++ Makefile.patch 2012-03-02 14:25:01 UTC (rev 151775) @@ -1,140 +0,0 @@ -diff -Naur src/Makefile src-p/Makefile src/Makefile 2007-08-20 16:47:41.0 +0200 -+++ src-p/Makefile 2007-10-02 04:07:44.0 +0200 -@@ -34,17 +34,17 @@ - - # Everything gets put in subdirectories of. . . - --TOPDIR= /usr/local -+TOPDIR= $(DESTDIR)/usr - - # Compiled time zone information is placed in the TZDIR directory - # (and subdirectories). - # Use an absolute path name for TZDIR unless you're just testing the software. - --TZDIR=$(TOPDIR)/etc/zoneinfo -+TZDIR=$(TOPDIR)/share/zoneinfo - - # The tzselect, zic, and zdump commands get installed in. . . - --ETCDIR= $(TOPDIR)/etc -+SBINDIR= $(TOPDIR)/sbin - - # If you make INSTALL, the date command gets installed in. . . - -@@ -52,7 +52,7 @@ - - # Manual pages go in subdirectories of. . . - --MANDIR= $(TOPDIR)/man -+MANDIR= $(TOPDIR)/share/man - - # Library functions are put in an archive in LIBDIR. - -@@ -83,7 +83,7 @@ - - # Non-default libraries needed to link. - # Add -lintl if you want to use `gettext' on Solaris. --LDLIBS= -+LDLIBS=$(LDFLAGS) - - # Add the following to the end of the CFLAGS= line as needed. - # -Dconst= if `const' does not work (SunOS 4.x cc, OSF1 V5.0 cc) -@@ -211,7 +211,7 @@ - # before the first Monday in January when a %V format is used and January 1 - # falls on a Friday, Saturday, or Sunday. - --CFLAGS= -+CFLAGS += -std=gnu99 - - # If you want zic's -s option used when installing, uncomment the next line - # ZFLAGS= -s -@@ -220,7 +220,7 @@ - ZIC= $(zic) $(ZFLAGS) - - # The name of a Posix-compliant `awk' on your system. --AWK= nawk -+AWK= awk - - # The path where SGML DTDs are kept. - SGML_SEARCH_PATH= $(TOPDIR)/share/doc/sgml-lib/REC-html401-19991224/ -@@ -241,8 +241,10 @@ - - ### - --cc= cc --CC= $(cc) -DTZDIR=\$(TZDIR)\ -+CC+= -DTZDIR=\$(TZDIR)\ -+ifeq ($(NLS),1) -+CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\libc\ -+endif - - TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c - TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o -@@ -282,14 +284,16 @@ - - ALL: all date - --install: all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA) -+install: all $(DATA) $(REDO) $(MANS) $(TABDATA) - $(ZIC) -y $(YEARISTYPE) \ - -d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) - -rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab - cp iso3166.tab zone.tab $(TZDIR)/. -- -mkdir $(TOPDIR) $(ETCDIR) -- cp tzselect zic zdump $(ETCDIR)/. -- -mkdir $(TOPDIR) $(MANDIR) \ -+ -mkdir -p $(TOPDIR) $(SBINDIR) -+ cp zic zdump $(SBINDIR)/. -+ -mkdir -p $(TOPDIR) $(BINDIR) -+ cp tzselect $(BINDIR)/. -+ -mkdir -p $(TOPDIR) $(MANDIR) \ - $(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8 - -rm -f $(MANDIR)/man3/newctime.3 \ - $(MANDIR)/man3/newtzset.3 \ -@@ -298,13 +302,11 @@ - $(MANDIR)/man8/zdump.8 \ - $(MANDIR)/man8/zic.8 - cp newctime.3 newtzset.3 $(MANDIR)/man3/. -- cp tzfile.5 $(MANDIR)/man5/. -- cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/. - - INSTALL: ALL install date.1 -- -mkdir $(TOPDIR) $(BINDIR) -+ -mkdir -p $(TOPDIR) $(BINDIR) - cp date $(BINDIR)/. -- -mkdir $(TOPDIR) $(MANDIR) $(MANDIR)/man1 -+ -mkdir -p $(TOPDIR) $(MANDIR) $(MANDIR)/man1 - -rm -f $(MANDIR)/man1/date.1 - cp date.1 $(MANDIR)/man1/. - -@@ -334,9 +336,9 @@ - # You must replace all of $(TZDIR) to switch from not using leap seconds - # to using them, or vice versa. - other_two:zic leapseconds $(TDATA) -- $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA) -+ $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA)
[arch-commits] Commit in tzdata/repos/testing-i686 (4 files)
Date: Friday, March 2, 2012 @ 09:25:26 Author: andyrtr Revision: 151776 archrelease: copy trunk to testing-i686 Added: tzdata/repos/testing-i686/Makefile.patch (from rev 151775, tzdata/trunk/Makefile.patch) tzdata/repos/testing-i686/PKGBUILD (from rev 151775, tzdata/trunk/PKGBUILD) Deleted: tzdata/repos/testing-i686/Makefile.patch tzdata/repos/testing-i686/PKGBUILD + Makefile.patch | 280 +++ PKGBUILD | 94 +- 2 files changed, 187 insertions(+), 187 deletions(-) Deleted: Makefile.patch === --- Makefile.patch 2012-03-02 14:25:01 UTC (rev 151775) +++ Makefile.patch 2012-03-02 14:25:26 UTC (rev 151776) @@ -1,140 +0,0 @@ -diff -Naur src/Makefile src-p/Makefile src/Makefile 2007-08-20 16:47:41.0 +0200 -+++ src-p/Makefile 2007-10-02 04:07:44.0 +0200 -@@ -34,17 +34,17 @@ - - # Everything gets put in subdirectories of. . . - --TOPDIR= /usr/local -+TOPDIR= $(DESTDIR)/usr - - # Compiled time zone information is placed in the TZDIR directory - # (and subdirectories). - # Use an absolute path name for TZDIR unless you're just testing the software. - --TZDIR=$(TOPDIR)/etc/zoneinfo -+TZDIR=$(TOPDIR)/share/zoneinfo - - # The tzselect, zic, and zdump commands get installed in. . . - --ETCDIR= $(TOPDIR)/etc -+SBINDIR= $(TOPDIR)/sbin - - # If you make INSTALL, the date command gets installed in. . . - -@@ -52,7 +52,7 @@ - - # Manual pages go in subdirectories of. . . - --MANDIR= $(TOPDIR)/man -+MANDIR= $(TOPDIR)/share/man - - # Library functions are put in an archive in LIBDIR. - -@@ -83,7 +83,7 @@ - - # Non-default libraries needed to link. - # Add -lintl if you want to use `gettext' on Solaris. --LDLIBS= -+LDLIBS=$(LDFLAGS) - - # Add the following to the end of the CFLAGS= line as needed. - # -Dconst= if `const' does not work (SunOS 4.x cc, OSF1 V5.0 cc) -@@ -211,7 +211,7 @@ - # before the first Monday in January when a %V format is used and January 1 - # falls on a Friday, Saturday, or Sunday. - --CFLAGS= -+CFLAGS += -std=gnu99 - - # If you want zic's -s option used when installing, uncomment the next line - # ZFLAGS= -s -@@ -220,7 +220,7 @@ - ZIC= $(zic) $(ZFLAGS) - - # The name of a Posix-compliant `awk' on your system. --AWK= nawk -+AWK= awk - - # The path where SGML DTDs are kept. - SGML_SEARCH_PATH= $(TOPDIR)/share/doc/sgml-lib/REC-html401-19991224/ -@@ -241,8 +241,10 @@ - - ### - --cc= cc --CC= $(cc) -DTZDIR=\$(TZDIR)\ -+CC+= -DTZDIR=\$(TZDIR)\ -+ifeq ($(NLS),1) -+CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\libc\ -+endif - - TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c - TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o -@@ -282,14 +284,16 @@ - - ALL: all date - --install: all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA) -+install: all $(DATA) $(REDO) $(MANS) $(TABDATA) - $(ZIC) -y $(YEARISTYPE) \ - -d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) - -rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab - cp iso3166.tab zone.tab $(TZDIR)/. -- -mkdir $(TOPDIR) $(ETCDIR) -- cp tzselect zic zdump $(ETCDIR)/. -- -mkdir $(TOPDIR) $(MANDIR) \ -+ -mkdir -p $(TOPDIR) $(SBINDIR) -+ cp zic zdump $(SBINDIR)/. -+ -mkdir -p $(TOPDIR) $(BINDIR) -+ cp tzselect $(BINDIR)/. -+ -mkdir -p $(TOPDIR) $(MANDIR) \ - $(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8 - -rm -f $(MANDIR)/man3/newctime.3 \ - $(MANDIR)/man3/newtzset.3 \ -@@ -298,13 +302,11 @@ - $(MANDIR)/man8/zdump.8 \ - $(MANDIR)/man8/zic.8 - cp newctime.3 newtzset.3 $(MANDIR)/man3/. -- cp tzfile.5 $(MANDIR)/man5/. -- cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/. - - INSTALL: ALL install date.1 -- -mkdir $(TOPDIR) $(BINDIR) -+ -mkdir -p $(TOPDIR) $(BINDIR) - cp date $(BINDIR)/. -- -mkdir $(TOPDIR) $(MANDIR) $(MANDIR)/man1 -+ -mkdir -p $(TOPDIR) $(MANDIR) $(MANDIR)/man1 - -rm -f $(MANDIR)/man1/date.1 - cp date.1 $(MANDIR)/man1/. - -@@ -334,9 +336,9 @@ - # You must replace all of $(TZDIR) to switch from not using leap seconds - # to using them, or vice versa. - other_two:zic leapseconds $(TDATA) -- $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA) -+ $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA) -
[arch-commits] Commit in kdeutils-ksecrets/trunk (PKGBUILD)
Date: Friday, March 2, 2012 @ 09:44:06
Author: andrea
Revision: 151777
Add missing deps (FS#28746)
Modified:
kdeutils-ksecrets/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-02 14:25:26 UTC (rev 151776)
+++ PKGBUILD2012-03-02 14:44:06 UTC (rev 151777)
@@ -8,7 +8,7 @@
url='http://techbase.kde.org/Projects/Utils/ksecretsservice'
arch=('i686' 'x86_64')
license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-workspace')
+depends=('kdebase-workspace' 'qca-ossl')
makedepends=('cmake' 'automoc4')
groups=('kde' 'kdeutils')
install=${pkgname}.install
[arch-commits] Commit in cvsps/trunk (9 files)
Date: Friday, March 2, 2012 @ 12:23:22
Author: dan
Revision: 151778
Update to 2.2b1, add Fedora patches, add other patches
Added:
cvsps/trunk/call-cvs-q-option.patch
cvsps/trunk/cvsps-2.2b1-bufferoverflow.patch
cvsps/trunk/cvsps-2.2b1-dynamic-logbuf.patch
cvsps/trunk/cvsps-2.2b1-man.patch
cvsps/trunk/seperate-CPPFLAGS.patch
cvsps/trunk/use-INADDR_NONE-define.patch
cvsps/trunk/use-__linux__-define.patch
cvsps/trunk/use-offsetof-macro.patch
Modified:
cvsps/trunk/PKGBUILD
--+
PKGBUILD | 35 +++--
call-cvs-q-option.patch | 34 +
cvsps-2.2b1-bufferoverflow.patch | 65 ++
cvsps-2.2b1-dynamic-logbuf.patch | 133 +
cvsps-2.2b1-man.patch| 29
seperate-CPPFLAGS.patch | 29
use-INADDR_NONE-define.patch | 28 +++
use-__linux__-define.patch | 36 ++
use-offsetof-macro.patch | 32
9 files changed, 414 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-02 14:44:06 UTC (rev 151777)
+++ PKGBUILD2012-03-02 17:23:22 UTC (rev 151778)
@@ -3,22 +3,43 @@
# Contributor: Jeff 'codemac' Mickey j...@archlinux.org
pkgname=cvsps
-pkgver=2.1
-pkgrel=4
+pkgver=2.2b1
+pkgrel=1
pkgdesc=Generating 'patchset' information from a CVS repository
url=http://www.cobite.com/cvsps/;
license=('GPL')
arch=('i686' 'x86_64')
depends=('zlib')
-source=(http://www.cobite.com/${pkgname}/${pkgname}-${pkgver}.tar.gz;)
-md5sums=('bde2110ed9f5d14de8f8cb04e9d596fe')
+source=(http://www.cobite.com/${pkgname}/${pkgname}-${pkgver}.tar.gz;
+call-cvs-q-option.patch
+cvsps-2.2b1-bufferoverflow.patch
+cvsps-2.2b1-dynamic-logbuf.patch
+cvsps-2.2b1-man.patch
+seperate-CPPFLAGS.patch
+use-INADDR_NONE-define.patch
+use-__linux__-define.patch
+use-offsetof-macro.patch)
+md5sums=('997580e8e283034995b9209076858c68'
+ '06324c5e3c321126b76dc97fc6c00b34'
+ '2910012a11a24d5e4192cf9eae7dd259'
+ '970566460e72cb159426965d6e5763b3'
+ 'f9d2ee40e52ecd5096fa9a885418eee1'
+ '6baafbd7512aa52e1b83ed0bead32a6e'
+ 'a3a81481c07dcc676f5a82ae07e8ee89'
+ '9e2763315cbda02665c47827d38df459'
+ '8f7e6f09f42f76deeefe24bbfa509150')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd $srcdir/$pkgname-$pkgver
+ for file in ${source[@]}; do
+ if [[ $file == *.patch ]]; then
+ patch -Np1 ../$file
+ fi
+ done
make prefix=/usr
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make prefix=${pkgdir}/usr install
+ cd $srcdir/$pkgname-$pkgver
+ make prefix=$pkgdir/usr install
}
Added: call-cvs-q-option.patch
===
--- call-cvs-q-option.patch (rev 0)
+++ call-cvs-q-option.patch 2012-03-02 17:23:22 UTC (rev 151778)
@@ -0,0 +1,34 @@
+From 49d7a3e44b54f18b0e2762d8dbb087ad4c2f0276 Mon Sep 17 00:00:00 2001
+From: Yann Dirson ydir...@altern.org
+Date: Thu, 15 Jun 2006 09:48:08 +0200
+Subject: [PATCH] Call cvs with -q flag when fetching the log
+
+This gets rid of the neverending output polution cvs sends to stderr,
+which is mostly useless and has a strong potential to hide real problem
+reports
+---
+ cvsps.c |4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cvsps.c b/cvsps.c
+index d94dfe0..be700ba 100644
+--- a/cvsps.c
b/cvsps.c
+@@ -301,12 +301,12 @@ static void load_from_cvs()
+* which is necessary to fill in the pre_rev stuff for a
+* PatchSetMember
+*/
+- snprintf(cmd, BUFSIZ, cvs %s %s %s -d '%s;%s' %s, compress_arg,
norc, ltype, date_str, date_str, use_rep_buff);
++ snprintf(cmd, BUFSIZ, cvs %s %s -q %s -d '%s;%s' %s, compress_arg,
norc, ltype, date_str, date_str, use_rep_buff);
+ }
+ else
+ {
+ date_str[0] = 0;
+- snprintf(cmd, BUFSIZ, cvs %s %s %s %s, compress_arg, norc, ltype,
use_rep_buff);
++ snprintf(cmd, BUFSIZ, cvs %s %s -q %s %s, compress_arg, norc, ltype,
use_rep_buff);
+ }
+
+ debug(DEBUG_STATUS, *** USING CMD %s, cmd);
+--
+1.6.5.GIT
+
Added: cvsps-2.2b1-bufferoverflow.patch
===
--- cvsps-2.2b1-bufferoverflow.patch(rev 0)
+++ cvsps-2.2b1-bufferoverflow.patch2012-03-02 17:23:22 UTC (rev 151778)
@@ -0,0 +1,65 @@
+--- cvsps-2.2b1/cvsps.c2010-09-07 18:13:42.760727491 +0200
cvsps-2.2b1_/cvsps.c 2010-09-07 18:05:11.083729441 +0200
+@@ -1065,17 +1065,16 @@ static CvsFile * parse_file(const char *
+ {
+ CvsFile * retval;
+ char fn[PATH_MAX];
+-int len = strlen(buff + 10);
++size_t len = strlen(buff + 10);
+ char * p;
+
+ /* once a single
[arch-commits] Commit in cvsps/repos (20 files)
Date: Friday, March 2, 2012 @ 12:28:27
Author: dan
Revision: 151779
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
cvsps/repos/extra-i686/PKGBUILD
(from rev 151778, cvsps/trunk/PKGBUILD)
cvsps/repos/extra-i686/call-cvs-q-option.patch
(from rev 151778, cvsps/trunk/call-cvs-q-option.patch)
cvsps/repos/extra-i686/cvsps-2.2b1-bufferoverflow.patch
(from rev 151778, cvsps/trunk/cvsps-2.2b1-bufferoverflow.patch)
cvsps/repos/extra-i686/cvsps-2.2b1-dynamic-logbuf.patch
(from rev 151778, cvsps/trunk/cvsps-2.2b1-dynamic-logbuf.patch)
cvsps/repos/extra-i686/cvsps-2.2b1-man.patch
(from rev 151778, cvsps/trunk/cvsps-2.2b1-man.patch)
cvsps/repos/extra-i686/seperate-CPPFLAGS.patch
(from rev 151778, cvsps/trunk/seperate-CPPFLAGS.patch)
cvsps/repos/extra-i686/use-INADDR_NONE-define.patch
(from rev 151778, cvsps/trunk/use-INADDR_NONE-define.patch)
cvsps/repos/extra-i686/use-__linux__-define.patch
(from rev 151778, cvsps/trunk/use-__linux__-define.patch)
cvsps/repos/extra-i686/use-offsetof-macro.patch
(from rev 151778, cvsps/trunk/use-offsetof-macro.patch)
cvsps/repos/extra-x86_64/PKGBUILD
(from rev 151778, cvsps/trunk/PKGBUILD)
cvsps/repos/extra-x86_64/call-cvs-q-option.patch
(from rev 151778, cvsps/trunk/call-cvs-q-option.patch)
cvsps/repos/extra-x86_64/cvsps-2.2b1-bufferoverflow.patch
(from rev 151778, cvsps/trunk/cvsps-2.2b1-bufferoverflow.patch)
cvsps/repos/extra-x86_64/cvsps-2.2b1-dynamic-logbuf.patch
(from rev 151778, cvsps/trunk/cvsps-2.2b1-dynamic-logbuf.patch)
cvsps/repos/extra-x86_64/cvsps-2.2b1-man.patch
(from rev 151778, cvsps/trunk/cvsps-2.2b1-man.patch)
cvsps/repos/extra-x86_64/seperate-CPPFLAGS.patch
(from rev 151778, cvsps/trunk/seperate-CPPFLAGS.patch)
cvsps/repos/extra-x86_64/use-INADDR_NONE-define.patch
(from rev 151778, cvsps/trunk/use-INADDR_NONE-define.patch)
cvsps/repos/extra-x86_64/use-__linux__-define.patch
(from rev 151778, cvsps/trunk/use-__linux__-define.patch)
cvsps/repos/extra-x86_64/use-offsetof-macro.patch
(from rev 151778, cvsps/trunk/use-offsetof-macro.patch)
Deleted:
cvsps/repos/extra-i686/PKGBUILD
cvsps/repos/extra-x86_64/PKGBUILD
---+
extra-i686/PKGBUILD | 69
extra-i686/call-cvs-q-option.patch| 34 ++
extra-i686/cvsps-2.2b1-bufferoverflow.patch | 65 +++
extra-i686/cvsps-2.2b1-dynamic-logbuf.patch | 133
extra-i686/cvsps-2.2b1-man.patch | 29 +
extra-i686/seperate-CPPFLAGS.patch| 29 +
extra-i686/use-INADDR_NONE-define.patch | 28 +
extra-i686/use-__linux__-define.patch | 36 ++
extra-i686/use-offsetof-macro.patch | 32 +
extra-x86_64/PKGBUILD | 69
extra-x86_64/call-cvs-q-option.patch | 34 ++
extra-x86_64/cvsps-2.2b1-bufferoverflow.patch | 65 +++
extra-x86_64/cvsps-2.2b1-dynamic-logbuf.patch | 133
extra-x86_64/cvsps-2.2b1-man.patch| 29 +
extra-x86_64/seperate-CPPFLAGS.patch | 29 +
extra-x86_64/use-INADDR_NONE-define.patch | 28 +
extra-x86_64/use-__linux__-define.patch | 36 ++
extra-x86_64/use-offsetof-macro.patch | 32 +
18 files changed, 862 insertions(+), 48 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-03-02 17:23:22 UTC (rev 151778)
+++ extra-i686/PKGBUILD 2012-03-02 17:28:27 UTC (rev 151779)
@@ -1,24 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Jeff 'codemac' Mickey j...@archlinux.org
-
-pkgname=cvsps
-pkgver=2.1
-pkgrel=4
-pkgdesc=Generating 'patchset' information from a CVS repository
-url=http://www.cobite.com/cvsps/;
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('zlib')
-source=(http://www.cobite.com/${pkgname}/${pkgname}-${pkgver}.tar.gz;)
-md5sums=('bde2110ed9f5d14de8f8cb04e9d596fe')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make prefix=/usr
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make prefix=${pkgdir}/usr install
-}
Copied: cvsps/repos/extra-i686/PKGBUILD (from rev 151778, cvsps/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-03-02 17:28:27 UTC (rev 151779)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer:
+# Contributor: Jeff 'codemac' Mickey j...@archlinux.org
+
+pkgname=cvsps
+pkgver=2.2b1
+pkgrel=1
+pkgdesc=Generating 'patchset' information from a CVS repository
+url=http://www.cobite.com/cvsps/;
+license=('GPL')
+arch=('i686' 'x86_64')
+depends=('zlib')
+source=(http://www.cobite.com/${pkgname}/${pkgname}-${pkgver}.tar.gz;
+call-cvs-q-option.patch
+cvsps-2.2b1-bufferoverflow.patch
+
[arch-commits] Commit in libxfont/trunk (PKGBUILD)
Date: Friday, March 2, 2012 @ 13:55:03
Author: andyrtr
Revision: 151780
upgpkg: libxfont 1.4.5-1
upstream update 1.4.5
Modified:
libxfont/trunk/PKGBUILD
--+
PKGBUILD |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-02 17:28:27 UTC (rev 151779)
+++ PKGBUILD2012-03-02 18:55:03 UTC (rev 151780)
@@ -2,7 +2,7 @@
# Maintainer: Jan de Groot j...@archlinux.org
pkgname=libxfont
-pkgver=1.4.4
+pkgver=1.4.5
pkgrel=1
pkgdesc=X11 font rasterisation library
arch=(i686 x86_64)
@@ -12,12 +12,16 @@
makedepends=('xorg-util-macros' 'xtrans')
options=('!libtool')
source=(${url}/archive/individual/lib/libXfont-${pkgver}.tar.bz2)
-sha1sums=('189dd7a3756cb80bcf41b779bf05ec3c366e3041')
+sha1sums=('0bf3cb8aa192ab96bbaf384d1a4a00d15a40171e')
build() {
cd ${srcdir}/libXfont-${pkgver}
./configure --prefix=/usr --sysconfdir=/etc --disable-static
make
+}
+
+package() {
+ cd ${srcdir}/libXfont-${pkgver}
make DESTDIR=${pkgdir} install
install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
[arch-commits] Commit in libxfont/repos (4 files)
Date: Friday, March 2, 2012 @ 13:55:43
Author: andyrtr
Revision: 151781
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
libxfont/repos/extra-i686/PKGBUILD
(from rev 151780, libxfont/trunk/PKGBUILD)
libxfont/repos/extra-x86_64/PKGBUILD
(from rev 151780, libxfont/trunk/PKGBUILD)
Deleted:
libxfont/repos/extra-i686/PKGBUILD
libxfont/repos/extra-x86_64/PKGBUILD
---+
extra-i686/PKGBUILD | 52 +---
extra-x86_64/PKGBUILD | 52 +---
2 files changed, 56 insertions(+), 48 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-03-02 18:55:03 UTC (rev 151780)
+++ extra-i686/PKGBUILD 2012-03-02 18:55:43 UTC (rev 151781)
@@ -1,24 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=libxfont
-pkgver=1.4.4
-pkgrel=1
-pkgdesc=X11 font rasterisation library
-arch=(i686 x86_64)
-url=http://xorg.freedesktop.org/;
-license=('custom')
-depends=('freetype2' 'libfontenc' 'xproto' 'fontsproto')
-makedepends=('xorg-util-macros' 'xtrans')
-options=('!libtool')
-source=(${url}/archive/individual/lib/libXfont-${pkgver}.tar.bz2)
-sha1sums=('189dd7a3756cb80bcf41b779bf05ec3c366e3041')
-
-build() {
- cd ${srcdir}/libXfont-${pkgver}
- ./configure --prefix=/usr --sysconfdir=/etc --disable-static
- make
- make DESTDIR=${pkgdir} install
- install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
- install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
-}
Copied: libxfont/repos/extra-i686/PKGBUILD (from rev 151780,
libxfont/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-03-02 18:55:43 UTC (rev 151781)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=libxfont
+pkgver=1.4.5
+pkgrel=1
+pkgdesc=X11 font rasterisation library
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('freetype2' 'libfontenc' 'xproto' 'fontsproto')
+makedepends=('xorg-util-macros' 'xtrans')
+options=('!libtool')
+source=(${url}/archive/individual/lib/libXfont-${pkgver}.tar.bz2)
+sha1sums=('0bf3cb8aa192ab96bbaf384d1a4a00d15a40171e')
+
+build() {
+ cd ${srcdir}/libXfont-${pkgver}
+ ./configure --prefix=/usr --sysconfdir=/etc --disable-static
+ make
+}
+
+package() {
+ cd ${srcdir}/libXfont-${pkgver}
+ make DESTDIR=${pkgdir} install
+ install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+ install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}
Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD 2012-03-02 18:55:03 UTC (rev 151780)
+++ extra-x86_64/PKGBUILD 2012-03-02 18:55:43 UTC (rev 151781)
@@ -1,24 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=libxfont
-pkgver=1.4.4
-pkgrel=1
-pkgdesc=X11 font rasterisation library
-arch=(i686 x86_64)
-url=http://xorg.freedesktop.org/;
-license=('custom')
-depends=('freetype2' 'libfontenc' 'xproto' 'fontsproto')
-makedepends=('xorg-util-macros' 'xtrans')
-options=('!libtool')
-source=(${url}/archive/individual/lib/libXfont-${pkgver}.tar.bz2)
-sha1sums=('189dd7a3756cb80bcf41b779bf05ec3c366e3041')
-
-build() {
- cd ${srcdir}/libXfont-${pkgver}
- ./configure --prefix=/usr --sysconfdir=/etc --disable-static
- make
- make DESTDIR=${pkgdir} install
- install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
- install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
-}
Copied: libxfont/repos/extra-x86_64/PKGBUILD (from rev 151780,
libxfont/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-03-02 18:55:43 UTC (rev 151781)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=libxfont
+pkgver=1.4.5
+pkgrel=1
+pkgdesc=X11 font rasterisation library
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('freetype2' 'libfontenc' 'xproto' 'fontsproto')
+makedepends=('xorg-util-macros' 'xtrans')
+options=('!libtool')
+source=(${url}/archive/individual/lib/libXfont-${pkgver}.tar.bz2)
+sha1sums=('0bf3cb8aa192ab96bbaf384d1a4a00d15a40171e')
+
+build() {
+ cd ${srcdir}/libXfont-${pkgver}
+ ./configure --prefix=/usr --sysconfdir=/etc --disable-static
+ make
+}
+
+package() {
+ cd ${srcdir}/libXfont-${pkgver}
+ make DESTDIR=${pkgdir} install
+ install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+ install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}
[arch-commits] Commit in xorg-xfs/trunk (PKGBUILD)
Date: Friday, March 2, 2012 @ 14:10:02
Author: andyrtr
Revision: 151782
upgpkg: xorg-xfs 1.1.2-1
upstream update 1.1.2
Modified:
xorg-xfs/trunk/PKGBUILD
--+
PKGBUILD | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-02 18:55:43 UTC (rev 151781)
+++ PKGBUILD2012-03-02 19:10:02 UTC (rev 151782)
@@ -3,27 +3,27 @@
# Contributor: Jan de Groot j...@archlinux.org
pkgname=xorg-xfs
-pkgver=1.1.1
-pkgrel=2
+pkgver=1.1.2
+pkgrel=1
pkgdesc=X.Org X11 xfs font server
arch=('i686' 'x86_64')
url=http://xorg.freedesktop.org/;
license=('custom')
backup=('etc/X11/fs/config')
-depends=('xorg-font-utils' 'libxfont=1.4.0' 'libfs=1.0.2' 'libx11=1.2.2')
-makedepends=('pkgconfig' 'xtrans')
+depends=('xorg-font-utils' 'libxfont=1.4.5' 'libfs=1.0.2' 'libx11=1.2.2')
+makedepends=('pkgconfig' 'xtrans' 'xorg-util-macros')
source=(${url}/releases/individual/app/xfs-${pkgver}.tar.bz2
${url}/releases/individual/app/xfsinfo-1.0.3.tar.bz2
${url}/releases/individual/app/fslsfonts-1.0.3.tar.bz2
${url}/releases/individual/app/fstobdf-1.0.4.tar.bz2
${url}/releases/individual/app/showfont-1.0.3.tar.bz2
xfs.rc)
-md5sums=('e02c6cae689c082b8c98a421df8f8670'
- 'aae6fa48b5c2ce9186a5ff4ccc14a1d4'
- '9b50d967ac6d4bae9bffb62a5e527a50'
- 'fc1f42aac16d6b76c79a1a3a0fb6a53b'
- '50b466ab6ed4a5b8df5abf1ef844309a'
- '251f5447f64151e9bb096ebc9f999c3f')
+sha1sums=('d4a64e12f8a773bd0120977191586ca12baf1ace'
+ '21c5f544f34d9164797575da85727558f5e09d33'
+ '00177564597ac629207ca597f663b689902817df'
+ '5310493f53277fd196f93bbb7f2a204cad8997b7'
+ '161bf5f037db70dd75cb327648fbba559e821e76'
+ '21277375814e358ec16e8f8330f420e3d4df63e5')
build() {
cd ${srcdir}
[arch-commits] Commit in xorg-xfs/repos (8 files)
Date: Friday, March 2, 2012 @ 14:10:39
Author: andyrtr
Revision: 151783
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xorg-xfs/repos/extra-i686/PKGBUILD
(from rev 151782, xorg-xfs/trunk/PKGBUILD)
xorg-xfs/repos/extra-i686/xfs.rc
(from rev 151782, xorg-xfs/trunk/xfs.rc)
xorg-xfs/repos/extra-x86_64/PKGBUILD
(from rev 151782, xorg-xfs/trunk/PKGBUILD)
xorg-xfs/repos/extra-x86_64/xfs.rc
(from rev 151782, xorg-xfs/trunk/xfs.rc)
Deleted:
xorg-xfs/repos/extra-i686/PKGBUILD
xorg-xfs/repos/extra-i686/xfs.rc
xorg-xfs/repos/extra-x86_64/PKGBUILD
xorg-xfs/repos/extra-x86_64/xfs.rc
---+
extra-i686/PKGBUILD | 128
extra-i686/xfs.rc | 92 +-
extra-x86_64/PKGBUILD | 128
extra-x86_64/xfs.rc | 92 +-
4 files changed, 220 insertions(+), 220 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-03-02 19:10:02 UTC (rev 151782)
+++ extra-i686/PKGBUILD 2012-03-02 19:10:39 UTC (rev 151783)
@@ -1,64 +0,0 @@
-# $Id$
-# Maintainer: Alexander Baldeck alexan...@archlinux.org
-# Contributor: Jan de Groot j...@archlinux.org
-
-pkgname=xorg-xfs
-pkgver=1.1.1
-pkgrel=2
-pkgdesc=X.Org X11 xfs font server
-arch=('i686' 'x86_64')
-url=http://xorg.freedesktop.org/;
-license=('custom')
-backup=('etc/X11/fs/config')
-depends=('xorg-font-utils' 'libxfont=1.4.0' 'libfs=1.0.2' 'libx11=1.2.2')
-makedepends=('pkgconfig' 'xtrans')
-source=(${url}/releases/individual/app/xfs-${pkgver}.tar.bz2
-${url}/releases/individual/app/xfsinfo-1.0.3.tar.bz2
-${url}/releases/individual/app/fslsfonts-1.0.3.tar.bz2
-${url}/releases/individual/app/fstobdf-1.0.4.tar.bz2
-${url}/releases/individual/app/showfont-1.0.3.tar.bz2
-xfs.rc)
-md5sums=('e02c6cae689c082b8c98a421df8f8670'
- 'aae6fa48b5c2ce9186a5ff4ccc14a1d4'
- '9b50d967ac6d4bae9bffb62a5e527a50'
- 'fc1f42aac16d6b76c79a1a3a0fb6a53b'
- '50b466ab6ed4a5b8df5abf1ef844309a'
- '251f5447f64151e9bb096ebc9f999c3f')
-
-build() {
- cd ${srcdir}
- pushd xfs-${pkgver}
- ./configure --prefix=/usr --sysconfdir=/etc
- make configdir=/etc/X11/fs
- popd
-
- for i in xfsinfo-* fslsfonts-* fstobdf-* showfont-*; do
-if [ -d ${i} ]; then
- pushd ${i}
- ./configure --prefix=/usr
- make
- popd
-fi
- done
-}
-
-package() {
- cd ${srcdir}
- pushd xfs-${pkgver}
- make configdir=/etc/X11/fs DESTDIR=${pkgdir} install
- sed -i -e 's|/lib/X11/|/share/|g' ${pkgdir}/etc/X11/fs/config
- install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
- install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.xfs
- popd
-
- for i in xfsinfo-* fslsfonts-* fstobdf-* showfont-*; do
-if [ -d ${i} ]; then
- pushd ${i}
- make DESTDIR=${pkgdir} install
- install -m644 COPYING
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${i%-*}
- popd
-fi
- done
- install -m755 -d ${pkgdir}/etc/rc.d
- install -m755 ${srcdir}/xfs.rc ${pkgdir}/etc/rc.d/xfs
-}
Copied: xorg-xfs/repos/extra-i686/PKGBUILD (from rev 151782,
xorg-xfs/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-03-02 19:10:39 UTC (rev 151783)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Alexander Baldeck alexan...@archlinux.org
+# Contributor: Jan de Groot j...@archlinux.org
+
+pkgname=xorg-xfs
+pkgver=1.1.2
+pkgrel=1
+pkgdesc=X.Org X11 xfs font server
+arch=('i686' 'x86_64')
+url=http://xorg.freedesktop.org/;
+license=('custom')
+backup=('etc/X11/fs/config')
+depends=('xorg-font-utils' 'libxfont=1.4.5' 'libfs=1.0.2' 'libx11=1.2.2')
+makedepends=('pkgconfig' 'xtrans' 'xorg-util-macros')
+source=(${url}/releases/individual/app/xfs-${pkgver}.tar.bz2
+${url}/releases/individual/app/xfsinfo-1.0.3.tar.bz2
+${url}/releases/individual/app/fslsfonts-1.0.3.tar.bz2
+${url}/releases/individual/app/fstobdf-1.0.4.tar.bz2
+${url}/releases/individual/app/showfont-1.0.3.tar.bz2
+xfs.rc)
+sha1sums=('d4a64e12f8a773bd0120977191586ca12baf1ace'
+ '21c5f544f34d9164797575da85727558f5e09d33'
+ '00177564597ac629207ca597f663b689902817df'
+ '5310493f53277fd196f93bbb7f2a204cad8997b7'
+ '161bf5f037db70dd75cb327648fbba559e821e76'
+ '21277375814e358ec16e8f8330f420e3d4df63e5')
+
+build() {
+ cd ${srcdir}
+ pushd xfs-${pkgver}
+ ./configure --prefix=/usr --sysconfdir=/etc
+ make configdir=/etc/X11/fs
+ popd
+
+ for i in xfsinfo-* fslsfonts-* fstobdf-* showfont-*; do
+if [ -d ${i} ]; then
+ pushd ${i}
+ ./configure --prefix=/usr
+ make
+ popd
+fi
+ done
+}
+
+package() {
+ cd ${srcdir}
+ pushd
[arch-commits] Commit in gnutls/trunk (PKGBUILD)
Date: Friday, March 2, 2012 @ 14:31:00
Author: andyrtr
Revision: 151784
upgpkg: gnutls 3.0.15-1
upstream update 3.0.15; disable valgrind tests, they are expected to be broken
in release tarballs and should be run from now on only on full git trees
Modified:
gnutls/trunk/PKGBUILD
--+
PKGBUILD |8
1 file changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-02 19:10:39 UTC (rev 151783)
+++ PKGBUILD2012-03-02 19:31:00 UTC (rev 151784)
@@ -2,7 +2,7 @@
# Maintainer: Jan de Groot j...@archlinux.org
pkgname=gnutls
-pkgver=3.0.14
+pkgver=3.0.15
pkgrel=1
pkgdesc=A library which provides a secure layer over a reliable transport
layer
arch=('i686' 'x86_64')
@@ -13,8 +13,8 @@
depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle=2.4' 'p11-kit=0.11')
makedepends=('valgrind' 'strace')
source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('0d613985c867846ccb5cbaba8fa576ef'
- '847af57e7d4702b176d1cbf157962f6e')
+md5sums=('37bdac12b5c039c7a8738b5d85eda968'
+ '594eb29cbc3147dc0b6b529ebe96bd33')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -22,7 +22,7 @@
--with-zlib \
--disable-static \
--disable-guile \
- --enable-valgrind-tests
+ --disable-valgrind-tests
make
}
[arch-commits] Commit in gnutls/repos (8 files)
Date: Friday, March 2, 2012 @ 14:31:37
Author: andyrtr
Revision: 151785
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
gnutls/repos/extra-i686/PKGBUILD
(from rev 151784, gnutls/trunk/PKGBUILD)
gnutls/repos/extra-i686/gnutls.install
(from rev 151784, gnutls/trunk/gnutls.install)
gnutls/repos/extra-x86_64/PKGBUILD
(from rev 151784, gnutls/trunk/PKGBUILD)
gnutls/repos/extra-x86_64/gnutls.install
(from rev 151784, gnutls/trunk/gnutls.install)
Deleted:
gnutls/repos/extra-i686/PKGBUILD
gnutls/repos/extra-i686/gnutls.install
gnutls/repos/extra-x86_64/PKGBUILD
gnutls/repos/extra-x86_64/gnutls.install
-+
extra-i686/PKGBUILD | 82 +-
extra-i686/gnutls.install | 40 ++--
extra-x86_64/PKGBUILD | 82 +-
extra-x86_64/gnutls.install | 40 ++--
4 files changed, 122 insertions(+), 122 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-03-02 19:31:00 UTC (rev 151784)
+++ extra-i686/PKGBUILD 2012-03-02 19:31:37 UTC (rev 151785)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=gnutls
-pkgver=3.0.14
-pkgrel=1
-pkgdesc=A library which provides a secure layer over a reliable transport
layer
-arch=('i686' 'x86_64')
-license=('GPL3' 'LGPL')
-url=http://www.gnu.org/software/gnutls/;
-install=gnutls.install
-options=('!libtool' '!zipman')
-depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle=2.4' 'p11-kit=0.11')
-makedepends=('valgrind' 'strace')
-source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('0d613985c867846ccb5cbaba8fa576ef'
- '847af57e7d4702b176d1cbf157962f6e')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr \
- --with-zlib \
- --disable-static \
- --disable-guile \
- --enable-valgrind-tests
- make
-}
-
-check() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make check # passes all || /bin/true
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
- # lots of .png files are put into infodir and are gzipped by makepkg! this
may need to be fixed by using !zipman
- # gzip -9 all files in infodir and manpages manually
- find $pkgdir/usr/share/info -name '*.info*' -exec gzip -9 {} \;
- find $pkgdir/usr/share/man -exec gzip -9 {} \;
-}
Copied: gnutls/repos/extra-i686/PKGBUILD (from rev 151784,
gnutls/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-03-02 19:31:37 UTC (rev 151785)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=gnutls
+pkgver=3.0.15
+pkgrel=1
+pkgdesc=A library which provides a secure layer over a reliable transport
layer
+arch=('i686' 'x86_64')
+license=('GPL3' 'LGPL')
+url=http://www.gnu.org/software/gnutls/;
+install=gnutls.install
+options=('!libtool' '!zipman')
+depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle=2.4' 'p11-kit=0.11')
+makedepends=('valgrind' 'strace')
+source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig})
+md5sums=('37bdac12b5c039c7a8738b5d85eda968'
+ '594eb29cbc3147dc0b6b529ebe96bd33')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./configure --prefix=/usr \
+ --with-zlib \
+ --disable-static \
+ --disable-guile \
+ --disable-valgrind-tests
+ make
+}
+
+check() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make check # passes all || /bin/true
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+ # lots of .png files are put into infodir and are gzipped by makepkg! this
may need to be fixed by using !zipman
+ # gzip -9 all files in infodir and manpages manually
+ find $pkgdir/usr/share/info -name '*.info*' -exec gzip -9 {} \;
+ find $pkgdir/usr/share/man -exec gzip -9 {} \;
+}
Deleted: extra-i686/gnutls.install
===
--- extra-i686/gnutls.install 2012-03-02 19:31:00 UTC (rev 151784)
+++ extra-i686/gnutls.install 2012-03-02 19:31:37 UTC (rev 151785)
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info.gz)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
-install-info $infodir/$file $infodir/dir 2 /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
-install-info --delete $infodir/$file $infodir/dir 2 /dev/null
- done
-}
Copied: gnutls/repos/extra-i686/gnutls.install (from rev 151784,
gnutls/trunk/gnutls.install)
===
[arch-commits] Commit in syslinux/repos (11 files)
Date: Friday, March 2, 2012 @ 17:51:24 Author: pierre Revision: 151786 db-move: moved syslinux from [extra] to [core] (i686) Added: syslinux/repos/core-i686/PKGBUILD (from rev 151785, syslinux/repos/extra-i686/PKGBUILD) syslinux/repos/core-i686/syslinux-dont-build-dos-windows-targets.patch (from rev 151785, syslinux/repos/extra-i686/syslinux-dont-build-dos-windows-targets.patch) syslinux/repos/core-i686/syslinux-install_update (from rev 151785, syslinux/repos/extra-i686/syslinux-install_update) syslinux/repos/core-i686/syslinux.cfg (from rev 151785, syslinux/repos/extra-i686/syslinux.cfg) syslinux/repos/core-i686/syslinux.install (from rev 151785, syslinux/repos/extra-i686/syslinux.install) Deleted: syslinux/repos/core-i686/PKGBUILD syslinux/repos/core-i686/syslinux-dont-build-dos-windows-targets.patch syslinux/repos/core-i686/syslinux-install_update syslinux/repos/core-i686/syslinux.cfg syslinux/repos/core-i686/syslinux.install syslinux/repos/extra-i686/ ---+ PKGBUILD | 100 +- syslinux-dont-build-dos-windows-targets.patch | 24 syslinux-install_update | 922 syslinux.cfg | 158 ++-- syslinux.install | 26 5 files changed, 618 insertions(+), 612 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 151785:151786 to see the changes.
[arch-commits] Commit in syslinux/repos (11 files)
Date: Friday, March 2, 2012 @ 17:51:25 Author: pierre Revision: 151787 db-move: moved syslinux from [extra] to [core] (x86_64) Added: syslinux/repos/core-x86_64/PKGBUILD (from rev 151785, syslinux/repos/extra-x86_64/PKGBUILD) syslinux/repos/core-x86_64/syslinux-dont-build-dos-windows-targets.patch (from rev 151785, syslinux/repos/extra-x86_64/syslinux-dont-build-dos-windows-targets.patch) syslinux/repos/core-x86_64/syslinux-install_update (from rev 151785, syslinux/repos/extra-x86_64/syslinux-install_update) syslinux/repos/core-x86_64/syslinux.cfg (from rev 151785, syslinux/repos/extra-x86_64/syslinux.cfg) syslinux/repos/core-x86_64/syslinux.install (from rev 151785, syslinux/repos/extra-x86_64/syslinux.install) Deleted: syslinux/repos/core-x86_64/PKGBUILD syslinux/repos/core-x86_64/syslinux-dont-build-dos-windows-targets.patch syslinux/repos/core-x86_64/syslinux-install_update syslinux/repos/core-x86_64/syslinux.cfg syslinux/repos/core-x86_64/syslinux.install syslinux/repos/extra-x86_64/ ---+ PKGBUILD | 100 +- syslinux-dont-build-dos-windows-targets.patch | 24 syslinux-install_update | 922 syslinux.cfg | 158 ++-- syslinux.install | 26 5 files changed, 618 insertions(+), 612 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 151786:151787 to see the changes.
[arch-commits] Commit in syslinux/trunk (PKGBUILD syslinux-install_update)
Date: Friday, March 2, 2012 @ 18:25:37
Author: pierre
Revision: 151788
Fix the path to extlinux in syslinux-install_update
Modified:
syslinux/trunk/PKGBUILD
syslinux/trunk/syslinux-install_update
-+
PKGBUILD|4 ++--
syslinux-install_update |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-02 22:51:25 UTC (rev 151787)
+++ PKGBUILD2012-03-02 23:25:37 UTC (rev 151788)
@@ -4,7 +4,7 @@
pkgname=syslinux
pkgver=4.05
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
pkgdesc=Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs
filesystems, from CDs and via PXE
url=http://syslinux.zytor.com/;
@@ -24,7 +24,7 @@
md5sums=('82299242418385da1274c9479a778cb2'
'1528c376e43f0eaccaa80d8ad1bc13b4'
'832595501944fbcabcdc1207f4724fe7'
- 'dd8a6a2104e64d8e4fee4f2d59ae223a')
+ '680750f73dc2e587ac567d057d485813')
build() {
# Do not try to build syslinux with our default LDFLAGS, it will fail
Modified: syslinux-install_update
===
--- syslinux-install_update 2012-03-02 22:51:25 UTC (rev 151787)
+++ syslinux-install_update 2012-03-02 23:25:37 UTC (rev 151788)
@@ -28,7 +28,7 @@
libpath=/usr/lib/syslinux
bootpath=/boot/syslinux
-extlinux=/sbin/extlinux
+extlinux=/usr/sbin/extlinux
autoupdate_file=/boot/syslinux/SYSLINUX_AUTOUPDATE
com32_files=(menu.c32 vesamenu.c32 chain.c32 hdt.c32 reboot.c32 poweroff.com)
[arch-commits] Commit in syslinux/repos (20 files)
Date: Friday, March 2, 2012 @ 18:26:36 Author: pierre Revision: 151789 archrelease: copy trunk to core-i686, core-x86_64 Added: syslinux/repos/core-i686/PKGBUILD (from rev 151788, syslinux/trunk/PKGBUILD) syslinux/repos/core-i686/syslinux-dont-build-dos-windows-targets.patch (from rev 151788, syslinux/trunk/syslinux-dont-build-dos-windows-targets.patch) syslinux/repos/core-i686/syslinux-install_update (from rev 151788, syslinux/trunk/syslinux-install_update) syslinux/repos/core-i686/syslinux.cfg (from rev 151788, syslinux/trunk/syslinux.cfg) syslinux/repos/core-i686/syslinux.install (from rev 151788, syslinux/trunk/syslinux.install) syslinux/repos/core-x86_64/PKGBUILD (from rev 151788, syslinux/trunk/PKGBUILD) syslinux/repos/core-x86_64/syslinux-dont-build-dos-windows-targets.patch (from rev 151788, syslinux/trunk/syslinux-dont-build-dos-windows-targets.patch) syslinux/repos/core-x86_64/syslinux-install_update (from rev 151788, syslinux/trunk/syslinux-install_update) syslinux/repos/core-x86_64/syslinux.cfg (from rev 151788, syslinux/trunk/syslinux.cfg) syslinux/repos/core-x86_64/syslinux.install (from rev 151788, syslinux/trunk/syslinux.install) Deleted: syslinux/repos/core-i686/PKGBUILD syslinux/repos/core-i686/syslinux-dont-build-dos-windows-targets.patch syslinux/repos/core-i686/syslinux-install_update syslinux/repos/core-i686/syslinux.cfg syslinux/repos/core-i686/syslinux.install syslinux/repos/core-x86_64/PKGBUILD syslinux/repos/core-x86_64/syslinux-dont-build-dos-windows-targets.patch syslinux/repos/core-x86_64/syslinux-install_update syslinux/repos/core-x86_64/syslinux.cfg syslinux/repos/core-x86_64/syslinux.install ---+ core-i686/PKGBUILD| 102 - core-i686/syslinux-dont-build-dos-windows-targets.patch | 24 core-i686/syslinux-install_update | 926 ++-- core-i686/syslinux.cfg| 158 +- core-i686/syslinux.install| 26 core-x86_64/PKGBUILD | 102 - core-x86_64/syslinux-dont-build-dos-windows-targets.patch | 24 core-x86_64/syslinux-install_update | 926 ++-- core-x86_64/syslinux.cfg | 158 +- core-x86_64/syslinux.install | 26 10 files changed, 1236 insertions(+), 1236 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 151788:151789 to see the changes.
[arch-commits] Commit in ypserv/repos (8 files)
Date: Friday, March 2, 2012 @ 20:11:11
Author: tomegun
Revision: 151790
db-move: moved ypserv from [testing] to [extra] (i686)
Added:
ypserv/repos/extra-i686/PKGBUILD
(from rev 151789, ypserv/repos/testing-i686/PKGBUILD)
ypserv/repos/extra-i686/confpost.patch
(from rev 151789, ypserv/repos/testing-i686/confpost.patch)
ypserv/repos/extra-i686/yppasswd
(from rev 151789, ypserv/repos/testing-i686/yppasswd)
ypserv/repos/extra-i686/ypserv
(from rev 151789, ypserv/repos/testing-i686/ypserv)
Deleted:
ypserv/repos/extra-i686/PKGBUILD
ypserv/repos/extra-i686/yppasswd
ypserv/repos/extra-i686/ypserv
ypserv/repos/testing-i686/
+
PKGBUILD | 79 +--
confpost.patch | 14 +
yppasswd | 68 +++
ypserv | 68 +++
4 files changed, 124 insertions(+), 105 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-03-02 23:26:36 UTC (rev 151789)
+++ extra-i686/PKGBUILD 2012-03-03 01:11:11 UTC (rev 151790)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson bis...@archlinux.org
-# Contributor: judd jvi...@zeroflux.org
-# Contributor: Tom Newsom jeeps...@gmx.co.uk
-
-pkgname=ypserv
-pkgver=2.26
-pkgrel=3
-pkgdesc='Linux NIS Server'
-arch=('i686' 'x86_64')
-url='http://www.linux-nis.org/nis/ypserv/'
-license=('GPL2')
-depends=('gdbm' 'openslp' 'inetutils')
-backup=('etc/ypserv.conf' 'etc/netgroup' 'var/yp/securenets')
-source=(ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${pkgname}-${pkgver}.tar.gz;
\
-'yppasswd'
-'ypserv')
-sha1sums=('0d7ab3f04ff7fa5f611e71ea0f3c188659602743'
- '96192b628afe36709496e4801d016c4bff343f0e'
- 'b625381bfa6cf62345377a7df30b8f45935206c5')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-
- install -D -m644 etc/netgroup ${pkgdir}/etc/netgroup
- install -D -m644 etc/ypserv.conf ${pkgdir}/etc/ypserv.conf
- install -D -m644 etc/securenets ${pkgdir}/var/yp/securenets
- install -D -m755 ../ypserv ${pkgdir}/etc/rc.d/ypserv
- install -D -m755 ../yppasswd ${pkgdir}/etc/rc.d/yppasswd
-}
Copied: ypserv/repos/extra-i686/PKGBUILD (from rev 151789,
ypserv/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-03-03 01:11:11 UTC (rev 151790)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Tom Gundersen t...@jklm.no
+# Contributor: Gaetan Bisson bis...@archlinux.org
+# Contributor: judd jvi...@zeroflux.org
+# Contributor: Tom Newsom jeeps...@gmx.co.uk
+
+pkgname=ypserv
+pkgver=2.27
+pkgrel=1
+pkgdesc='Linux NIS Server'
+arch=('i686' 'x86_64')
+url='http://www.linux-nis.org/nis/ypserv/'
+license=('GPL2')
+depends=('gdbm' 'openslp' 'inetutils')
+optdepends=('gawk: for printcap support')
+backup=('etc/ypserv.conf' 'etc/netgroup' 'var/yp/securenets')
+source=(http://www.linux-nis.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2;
+ confpost.patch
+'yppasswd'
+'ypserv')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ patch -p1 -i ../confpost.patch
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+
+ install -D -m644 etc/netgroup ${pkgdir}/etc/netgroup
+ install -D -m644 etc/ypserv.conf ${pkgdir}/etc/ypserv.conf
+ install -D -m644 etc/securenets ${pkgdir}/var/yp/securenets
+ install -D -m755 ../ypserv ${pkgdir}/etc/rc.d/ypserv
+ install -D -m755 ../yppasswd ${pkgdir}/etc/rc.d/yppasswd
+}
+md5sums=('fd9c43aec932a92be07b723c647b02a4'
+ '8acb314f30d6e531ac9efa8655f68ccb'
+ '4bc84c48ed1bb9659698853acb5cfd76'
+ 'c40befe5932f1b42efaced6b46809303')
Copied: ypserv/repos/extra-i686/confpost.patch (from rev 151789,
ypserv/repos/testing-i686/confpost.patch)
===
--- extra-i686/confpost.patch (rev 0)
+++ extra-i686/confpost.patch 2012-03-03 01:11:11 UTC (rev 151790)
@@ -0,0 +1,14 @@
+diff -up ypserv-2.27/conf_post.h.qdbm ypserv-2.27/conf_post.h
+--- ypserv-2.27/conf_post.h.qdbm 2012-02-01 14:18:01.780846425 +0100
ypserv-2.27/conf_post.h2012-02-01 14:18:01.780846425 +0100
+@@ -0,0 +1,10 @@
++/* Define common preprocessor symbol for HAVE_LIBGDBM and HAVE_LIBQDBM, since
++ * libraries gdbm and qdbm have same symbol names. */
++#undef HAVE_COMPAT_LIBGDBM
++#ifdef HAVE_LIBGDBM
++#define HAVE_COMPAT_LIBGDBM
++#endif
++#ifdef HAVE_LIBQDBM
++#define HAVE_COMPAT_LIBGDBM
++#endif
++
Deleted:
[arch-commits] Commit in ypserv/repos (8 files)
Date: Friday, March 2, 2012 @ 20:11:12
Author: tomegun
Revision: 151791
db-move: moved ypserv from [testing] to [extra] (x86_64)
Added:
ypserv/repos/extra-x86_64/PKGBUILD
(from rev 151789, ypserv/repos/testing-x86_64/PKGBUILD)
ypserv/repos/extra-x86_64/confpost.patch
(from rev 151789, ypserv/repos/testing-x86_64/confpost.patch)
ypserv/repos/extra-x86_64/yppasswd
(from rev 151789, ypserv/repos/testing-x86_64/yppasswd)
ypserv/repos/extra-x86_64/ypserv
(from rev 151789, ypserv/repos/testing-x86_64/ypserv)
Deleted:
ypserv/repos/extra-x86_64/PKGBUILD
ypserv/repos/extra-x86_64/yppasswd
ypserv/repos/extra-x86_64/ypserv
ypserv/repos/testing-x86_64/
+
PKGBUILD | 79 +--
confpost.patch | 14 +
yppasswd | 68 +++
ypserv | 68 +++
4 files changed, 124 insertions(+), 105 deletions(-)
Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD 2012-03-03 01:11:11 UTC (rev 151790)
+++ extra-x86_64/PKGBUILD 2012-03-03 01:11:12 UTC (rev 151791)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson bis...@archlinux.org
-# Contributor: judd jvi...@zeroflux.org
-# Contributor: Tom Newsom jeeps...@gmx.co.uk
-
-pkgname=ypserv
-pkgver=2.26
-pkgrel=3
-pkgdesc='Linux NIS Server'
-arch=('i686' 'x86_64')
-url='http://www.linux-nis.org/nis/ypserv/'
-license=('GPL2')
-depends=('gdbm' 'openslp' 'inetutils')
-backup=('etc/ypserv.conf' 'etc/netgroup' 'var/yp/securenets')
-source=(ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${pkgname}-${pkgver}.tar.gz;
\
-'yppasswd'
-'ypserv')
-sha1sums=('0d7ab3f04ff7fa5f611e71ea0f3c188659602743'
- '96192b628afe36709496e4801d016c4bff343f0e'
- 'b625381bfa6cf62345377a7df30b8f45935206c5')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-
- install -D -m644 etc/netgroup ${pkgdir}/etc/netgroup
- install -D -m644 etc/ypserv.conf ${pkgdir}/etc/ypserv.conf
- install -D -m644 etc/securenets ${pkgdir}/var/yp/securenets
- install -D -m755 ../ypserv ${pkgdir}/etc/rc.d/ypserv
- install -D -m755 ../yppasswd ${pkgdir}/etc/rc.d/yppasswd
-}
Copied: ypserv/repos/extra-x86_64/PKGBUILD (from rev 151789,
ypserv/repos/testing-x86_64/PKGBUILD)
===
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-03-03 01:11:12 UTC (rev 151791)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Tom Gundersen t...@jklm.no
+# Contributor: Gaetan Bisson bis...@archlinux.org
+# Contributor: judd jvi...@zeroflux.org
+# Contributor: Tom Newsom jeeps...@gmx.co.uk
+
+pkgname=ypserv
+pkgver=2.27
+pkgrel=1
+pkgdesc='Linux NIS Server'
+arch=('i686' 'x86_64')
+url='http://www.linux-nis.org/nis/ypserv/'
+license=('GPL2')
+depends=('gdbm' 'openslp' 'inetutils')
+optdepends=('gawk: for printcap support')
+backup=('etc/ypserv.conf' 'etc/netgroup' 'var/yp/securenets')
+source=(http://www.linux-nis.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2;
+ confpost.patch
+'yppasswd'
+'ypserv')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ patch -p1 -i ../confpost.patch
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+
+ install -D -m644 etc/netgroup ${pkgdir}/etc/netgroup
+ install -D -m644 etc/ypserv.conf ${pkgdir}/etc/ypserv.conf
+ install -D -m644 etc/securenets ${pkgdir}/var/yp/securenets
+ install -D -m755 ../ypserv ${pkgdir}/etc/rc.d/ypserv
+ install -D -m755 ../yppasswd ${pkgdir}/etc/rc.d/yppasswd
+}
+md5sums=('fd9c43aec932a92be07b723c647b02a4'
+ '8acb314f30d6e531ac9efa8655f68ccb'
+ '4bc84c48ed1bb9659698853acb5cfd76'
+ 'c40befe5932f1b42efaced6b46809303')
Copied: ypserv/repos/extra-x86_64/confpost.patch (from rev 151789,
ypserv/repos/testing-x86_64/confpost.patch)
===
--- extra-x86_64/confpost.patch (rev 0)
+++ extra-x86_64/confpost.patch 2012-03-03 01:11:12 UTC (rev 151791)
@@ -0,0 +1,14 @@
+diff -up ypserv-2.27/conf_post.h.qdbm ypserv-2.27/conf_post.h
+--- ypserv-2.27/conf_post.h.qdbm 2012-02-01 14:18:01.780846425 +0100
ypserv-2.27/conf_post.h2012-02-01 14:18:01.780846425 +0100
+@@ -0,0 +1,10 @@
++/* Define common preprocessor symbol for HAVE_LIBGDBM and HAVE_LIBQDBM, since
++ * libraries gdbm and qdbm have same symbol names. */
++#undef HAVE_COMPAT_LIBGDBM
++#ifdef HAVE_LIBGDBM
++#define HAVE_COMPAT_LIBGDBM
++#endif
++#ifdef HAVE_LIBQDBM
[arch-commits] Commit in gcc/trunk (PKGBUILD)
Date: Friday, March 2, 2012 @ 20:31:38
Author: allan
Revision: 151792
upgpkg: gcc 4.6.3-1
upstream update
Modified:
gcc/trunk/PKGBUILD
--+
PKGBUILD | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-03 01:11:12 UTC (rev 151791)
+++ PKGBUILD2012-03-03 01:31:38 UTC (rev 151792)
@@ -5,9 +5,9 @@
# NOTE: libtool requires rebuilt with each new gcc version
pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
-pkgver=4.6.2
-pkgrel=8
-_snapshot=4.6-20120120
+pkgver=4.6.3
+pkgrel=1
+#_snapshot=4.6-20120120
_libstdcppmanver=20111215 # Note: check source directory name
when updating this
pkgdesc=The GNU Compiler Collection
arch=('i686' 'x86_64')
@@ -16,13 +16,13 @@
makedepends=('binutils=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada')
checkdepends=('dejagnu')
options=('!libtool' '!emptydirs')
-source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
-
ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
+source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
+
#ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2
gcc_pure64.patch
gcc-hash-style-both.patch
gcc-4.6.2-cloog-0.17.patch)
-md5sums=('f7ca5d9f7a07216577f81318b7cf56ef'
+md5sums=('773092fe5194353b02bb0110052a972e'
'450772ce32daed97d7383199f8797f33'
'4030ee1c08dd1e843c0225b772360e76'
'4df25b623799b148a0703eaeec8fdf3f'
[arch-commits] Commit in gcc/repos (36 files)
Date: Friday, March 2, 2012 @ 20:34:23 Author: allan Revision: 151793 archrelease: copy trunk to testing-i686, testing-x86_64 Added: gcc/repos/testing-i686/PKGBUILD (from rev 151792, gcc/trunk/PKGBUILD) gcc/repos/testing-i686/gcc-4.6.2-cloog-0.17.patch (from rev 151792, gcc/trunk/gcc-4.6.2-cloog-0.17.patch) gcc/repos/testing-i686/gcc-ada.install (from rev 151792, gcc/trunk/gcc-ada.install) gcc/repos/testing-i686/gcc-fortran.install (from rev 151792, gcc/trunk/gcc-fortran.install) gcc/repos/testing-i686/gcc-go.install (from rev 151792, gcc/trunk/gcc-go.install) gcc/repos/testing-i686/gcc-hash-style-both.patch (from rev 151792, gcc/trunk/gcc-hash-style-both.patch) gcc/repos/testing-i686/gcc-libs.install (from rev 151792, gcc/trunk/gcc-libs.install) gcc/repos/testing-i686/gcc.install (from rev 151792, gcc/trunk/gcc.install) gcc/repos/testing-i686/gcc_pure64.patch (from rev 151792, gcc/trunk/gcc_pure64.patch) gcc/repos/testing-x86_64/PKGBUILD (from rev 151792, gcc/trunk/PKGBUILD) gcc/repos/testing-x86_64/gcc-4.6.2-cloog-0.17.patch (from rev 151792, gcc/trunk/gcc-4.6.2-cloog-0.17.patch) gcc/repos/testing-x86_64/gcc-ada.install (from rev 151792, gcc/trunk/gcc-ada.install) gcc/repos/testing-x86_64/gcc-fortran.install (from rev 151792, gcc/trunk/gcc-fortran.install) gcc/repos/testing-x86_64/gcc-go.install (from rev 151792, gcc/trunk/gcc-go.install) gcc/repos/testing-x86_64/gcc-hash-style-both.patch (from rev 151792, gcc/trunk/gcc-hash-style-both.patch) gcc/repos/testing-x86_64/gcc-libs.install (from rev 151792, gcc/trunk/gcc-libs.install) gcc/repos/testing-x86_64/gcc.install (from rev 151792, gcc/trunk/gcc.install) gcc/repos/testing-x86_64/gcc_pure64.patch (from rev 151792, gcc/trunk/gcc_pure64.patch) Deleted: gcc/repos/testing-i686/PKGBUILD gcc/repos/testing-i686/gcc-4.6.2-cloog-0.17.patch gcc/repos/testing-i686/gcc-ada.install gcc/repos/testing-i686/gcc-fortran.install gcc/repos/testing-i686/gcc-go.install gcc/repos/testing-i686/gcc-hash-style-both.patch gcc/repos/testing-i686/gcc-libs.install gcc/repos/testing-i686/gcc.install gcc/repos/testing-i686/gcc_pure64.patch gcc/repos/testing-x86_64/PKGBUILD gcc/repos/testing-x86_64/gcc-4.6.2-cloog-0.17.patch gcc/repos/testing-x86_64/gcc-ada.install gcc/repos/testing-x86_64/gcc-fortran.install gcc/repos/testing-x86_64/gcc-go.install gcc/repos/testing-x86_64/gcc-hash-style-both.patch gcc/repos/testing-x86_64/gcc-libs.install gcc/repos/testing-x86_64/gcc.install gcc/repos/testing-x86_64/gcc_pure64.patch ---+ testing-i686/PKGBUILD | 530 ++-- testing-i686/gcc-4.6.2-cloog-0.17.patch | 72 +-- testing-i686/gcc-ada.install | 40 +- testing-i686/gcc-fortran.install | 32 - testing-i686/gcc-go.install | 40 +- testing-i686/gcc-hash-style-both.patch| 244 ++-- testing-i686/gcc-libs.install | 32 - testing-i686/gcc.install | 40 +- testing-i686/gcc_pure64.patch | 52 +- testing-x86_64/PKGBUILD | 530 ++-- testing-x86_64/gcc-4.6.2-cloog-0.17.patch | 72 +-- testing-x86_64/gcc-ada.install| 40 +- testing-x86_64/gcc-fortran.install| 32 - testing-x86_64/gcc-go.install | 40 +- testing-x86_64/gcc-hash-style-both.patch | 244 ++-- testing-x86_64/gcc-libs.install | 32 - testing-x86_64/gcc.install| 40 +- testing-x86_64/gcc_pure64.patch | 52 +- 18 files changed, 1082 insertions(+), 1082 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 151792:151793 to see the changes.
[arch-commits] Commit in libtool/trunk (PKGBUILD)
Date: Friday, March 2, 2012 @ 21:44:34
Author: allan
Revision: 151794
upgpkg: libtool 2.4.2-4
gcc rebuild
Modified:
libtool/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-03 01:34:23 UTC (rev 151793)
+++ PKGBUILD2012-03-03 02:44:34 UTC (rev 151794)
@@ -6,7 +6,7 @@
pkgname=('libtool' 'libltdl')
pkgver=2.4.2
-pkgrel=3
+pkgrel=4
pkgdesc=A generic library support script
arch=('i686' 'x86_64')
url=http://www.gnu.org/software/libtool;
@@ -28,7 +28,7 @@
}
package_libtool() {
- depends=('sh' libltdl=$pkgver 'tar' 'gcc=4.6.2')
+ depends=('sh' libltdl=$pkgver 'tar' 'gcc=4.6.3')
groups=('base-devel')
install=libtool.install
[arch-commits] Commit in libtool/repos (6 files)
Date: Friday, March 2, 2012 @ 21:45:49
Author: allan
Revision: 151795
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
libtool/repos/testing-i686/
libtool/repos/testing-i686/PKGBUILD
(from rev 151794, libtool/trunk/PKGBUILD)
libtool/repos/testing-i686/libtool.install
(from rev 151794, libtool/trunk/libtool.install)
libtool/repos/testing-x86_64/
libtool/repos/testing-x86_64/PKGBUILD
(from rev 151794, libtool/trunk/PKGBUILD)
libtool/repos/testing-x86_64/libtool.install
(from rev 151794, libtool/trunk/libtool.install)
+
testing-i686/PKGBUILD | 49 +++
testing-i686/libtool.install | 20 +++
testing-x86_64/PKGBUILD| 49 +++
testing-x86_64/libtool.install | 20 +++
4 files changed, 138 insertions(+)
Copied: libtool/repos/testing-i686/PKGBUILD (from rev 151794,
libtool/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-03-03 02:45:49 UTC (rev 151795)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Allan McRae al...@archlinux.org
+# Contributor: judd jvi...@zeroflux.org
+
+# NOTE: requires rebuilt with each new gcc version
+
+pkgname=('libtool' 'libltdl')
+pkgver=2.4.2
+pkgrel=4
+pkgdesc=A generic library support script
+arch=('i686' 'x86_64')
+url=http://www.gnu.org/software/libtool;
+license=('GPL')
+options=('!libtool')
+source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz{,.sig})
+md5sums=('2ec8997e0c07249eb4cbd072417d70fe'
+ '1e6ba57420c82c663c85e745d11c7eed')
+
+build() {
+ cd ${srcdir}/${pkgbase}-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ cd ${srcdir}/${pkgbase}-${pkgver}
+ make check
+}
+
+package_libtool() {
+ depends=('sh' libltdl=$pkgver 'tar' 'gcc=4.6.3')
+ groups=('base-devel')
+ install=libtool.install
+
+ cd ${srcdir}/${pkgbase}-${pkgver}
+
+ make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \
+ install-data-local
+ rm -rf ${pkgdir}/usr/share/libtool/libltdl/
+}
+
+package_libltdl() {
+ pkgdesc=A system independent dlopen wrapper for GNU libtool
+
+ cd ${srcdir}/${pkgbase}-${pkgver}
+ make DESTDIR=${pkgdir} install-libLTLIBRARIES install-includeHEADERS \
+ install-ltdlincludeHEADERS install-data-local
+ rm -rf ${pkgdir}/usr/share/{aclocal,libtool/config}
+}
Copied: libtool/repos/testing-i686/libtool.install (from rev 151794,
libtool/trunk/libtool.install)
===
--- testing-i686/libtool.install(rev 0)
+++ testing-i686/libtool.install2012-03-03 02:45:49 UTC (rev 151795)
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(libtool.info libtool.info-1 libtool.info-2)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+install-info $infodir/$file.gz $infodir/dir 2 /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+install-info --delete $infodir/$file.gz $infodir/dir 2 /dev/null
+ done
+}
Copied: libtool/repos/testing-x86_64/PKGBUILD (from rev 151794,
libtool/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-03-03 02:45:49 UTC (rev 151795)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Allan McRae al...@archlinux.org
+# Contributor: judd jvi...@zeroflux.org
+
+# NOTE: requires rebuilt with each new gcc version
+
+pkgname=('libtool' 'libltdl')
+pkgver=2.4.2
+pkgrel=4
+pkgdesc=A generic library support script
+arch=('i686' 'x86_64')
+url=http://www.gnu.org/software/libtool;
+license=('GPL')
+options=('!libtool')
+source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz{,.sig})
+md5sums=('2ec8997e0c07249eb4cbd072417d70fe'
+ '1e6ba57420c82c663c85e745d11c7eed')
+
+build() {
+ cd ${srcdir}/${pkgbase}-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ cd ${srcdir}/${pkgbase}-${pkgver}
+ make check
+}
+
+package_libtool() {
+ depends=('sh' libltdl=$pkgver 'tar' 'gcc=4.6.3')
+ groups=('base-devel')
+ install=libtool.install
+
+ cd ${srcdir}/${pkgbase}-${pkgver}
+
+ make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \
+ install-data-local
+ rm -rf ${pkgdir}/usr/share/libtool/libltdl/
+}
+
+package_libltdl() {
+ pkgdesc=A system independent dlopen wrapper for GNU libtool
+
+ cd ${srcdir}/${pkgbase}-${pkgver}
+ make DESTDIR=${pkgdir} install-libLTLIBRARIES install-includeHEADERS \
+ install-ltdlincludeHEADERS install-data-local
+ rm -rf
[arch-commits] Commit in kmod/trunk (3 files)
Date: Saturday, March 3, 2012 @ 00:10:06
Author: dreisner
Revision: 151796
upgpkg: kmod 6-1
Modified:
kmod/trunk/PKGBUILD
Deleted:
kmod/trunk/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch
kmod/trunk/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch
-+
0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch | 28 ---
0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch | 39
--
PKGBUILD| 21 +
3 files changed, 5 insertions(+), 83 deletions(-)
Deleted: 0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch
===
--- 0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch
2012-03-03 02:45:49 UTC (rev 151795)
+++ 0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch
2012-03-03 05:10:06 UTC (rev 151796)
@@ -1,28 +0,0 @@
-From 269de2e0bf5011072da2f40f4f2d4023fad696b9 Mon Sep 17 00:00:00 2001
-From: Lucas De Marchi lucas.demar...@profusion.mobi
-Date: Tue, 7 Feb 2012 09:48:59 -0200
-Subject: [PATCH] libkmod-module: probe: Fix ignore-loaded flag not being
- applied
-
- TODO |3 +++
- libkmod/libkmod-module.c |3 ++-
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
-index 0af3e2e..b5eb7c9 100644
a/libkmod/libkmod-module.c
-+++ b/libkmod/libkmod-module.c
-@@ -1132,7 +1132,8 @@ KMOD_EXPORT int kmod_module_probe_insert_module(struct
kmod_module *mod,
- if (mod == NULL)
- return -ENOENT;
-
-- if (module_is_inkernel(mod)) {
-+ if (!(flags KMOD_PROBE_IGNORE_LOADED)
-+ module_is_inkernel(mod)) {
- if (flags KMOD_PROBE_FAIL_ON_LOADED)
- return -EEXIST;
- else
---
-1.7.9
-
Deleted: 0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch
===
--- 0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch
2012-03-03 02:45:49 UTC (rev 151795)
+++ 0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch
2012-03-03 05:10:06 UTC (rev 151796)
@@ -1,39 +0,0 @@
-From 8cd0f9e4f9f5c093136a7a2c0c2998b9dd203161 Mon Sep 17 00:00:00 2001
-From: Lucas De Marchi lucas.demar...@profusion.mobi
-Date: Sat, 11 Feb 2012 19:45:29 -0200
-Subject: [PATCH] libkmod-module: probe: fix infinite loop with softdeps
-
-If a softdep depends on a module in the dependency list of the module
-being inserted, we would enter and infinite loop.
-
-Move the mod-visited = true assignment to the proper place, hoping it
-didn't break other use cases. This is a bug that comes and goes every
-now and then. Since we have a testsuite now, a test for this should be
-written.
- libkmod/libkmod-module.c |2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
-index b5eb7c9..835896f 100644
a/libkmod/libkmod-module.c
-+++ b/libkmod/libkmod-module.c
-@@ -1013,7 +1013,6 @@ static int __kmod_module_fill_softdep(struct kmod_module
*mod,
- goto fail;
- }
- *list = l;
-- mod-visited = true;
- mod-ignorecmd = (pre != NULL || post != NULL);
-
- kmod_list_foreach(l, post) {
-@@ -1043,6 +1042,7 @@ static int __kmod_module_get_probe_list(struct
kmod_module *mod,
- mod-name);
- return 0;
- }
-+ mod-visited = true;
-
- dep = kmod_module_get_dependencies(mod);
- kmod_list_foreach(l, dep) {
---
-1.7.9
-
Modified: PKGBUILD
===
--- PKGBUILD2012-03-03 02:45:49 UTC (rev 151795)
+++ PKGBUILD2012-03-03 05:10:06 UTC (rev 151796)
@@ -2,38 +2,27 @@
# Maintainer: Dave Reisner dreis...@archlinux.org
pkgname=kmod
-pkgver=5
-pkgrel=4
+pkgver=6
+pkgrel=1
pkgdesc=Linux kernel module handling
arch=('i686' 'x86_64')
-url=http://git.profusion.mobi/cgit.cgi/kmod.git;
+url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary'
license=('GPL2')
depends=('glibc' 'zlib')
options=('!libtool')
provides=('module-init-tools=3.16')
conflicts=('module-init-tools')
replaces=('module-init-tools')
-source=(http://packages.profusion.mobi/$pkgname/$pkgname-$pkgver.tar.xz;
-'0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch'
-'0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch'
+source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz;
depmod-search.conf)
-md5sums=('b271c2ec54aba1c67bda63c8579d8c15'
- '81545a1509b43008f85c03fb980f0e86'
- '662a85dbe420f04c1ef24f9cd4e4c990'
[arch-commits] Commit in kmod/repos (6 files)
Date: Saturday, March 3, 2012 @ 00:10:17
Author: dreisner
Revision: 151797
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
kmod/repos/testing-i686/
kmod/repos/testing-i686/PKGBUILD
(from rev 151796, kmod/trunk/PKGBUILD)
kmod/repos/testing-i686/depmod-search.conf
(from rev 151796, kmod/trunk/depmod-search.conf)
kmod/repos/testing-x86_64/
kmod/repos/testing-x86_64/PKGBUILD
(from rev 151796, kmod/trunk/PKGBUILD)
kmod/repos/testing-x86_64/depmod-search.conf
(from rev 151796, kmod/trunk/depmod-search.conf)
---+
testing-i686/PKGBUILD | 53
testing-i686/depmod-search.conf |5 +++
testing-x86_64/PKGBUILD | 53
testing-x86_64/depmod-search.conf |5 +++
4 files changed, 116 insertions(+)
Copied: kmod/repos/testing-i686/PKGBUILD (from rev 151796, kmod/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-03-03 05:10:17 UTC (rev 151797)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Dave Reisner dreis...@archlinux.org
+
+pkgname=kmod
+pkgver=6
+pkgrel=1
+pkgdesc=Linux kernel module handling
+arch=('i686' 'x86_64')
+url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary'
+license=('GPL2')
+depends=('glibc' 'zlib')
+options=('!libtool')
+provides=('module-init-tools=3.16')
+conflicts=('module-init-tools')
+replaces=('module-init-tools')
+source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz;
+depmod-search.conf)
+md5sums=('bad08102fad212cd34405136d9a7eb94'
+ '4b8cbcbc54b9029c99fd730e257d4436')
+
+build() {
+ cd $pkgname-$pkgver
+
+ ./configure \
+--sysconfdir=/etc \
+--with-zlib
+
+ make
+}
+
+check() {
+ make -C $pkgname-$pkgver check
+}
+
+package() {
+ make -C $pkgname-$pkgver DESTDIR=$pkgdir install
+
+ # extra directories
+ install -dm755 $pkgdir/{etc,lib}/{depmod,modprobe}.d $pkgdir/sbin
+
+ # add symlinks to kmod
+ ln -s ../usr/bin/kmod $pkgdir/sbin/modprobe
+ ln -s ../usr/bin/kmod $pkgdir/sbin/depmod
+
+ for tool in {ins,ls,rm}mod modinfo; do
+ln -s kmod $pkgdir/usr/bin/$tool
+ done
+
+ # install depmod.d file for search/ dir
+ install -Dm644 $srcdir/depmod-search.conf
$pkgdir/lib/depmod.d/search.conf
+}
+
+# vim: ft=sh syn=sh et
Copied: kmod/repos/testing-i686/depmod-search.conf (from rev 151796,
kmod/trunk/depmod-search.conf)
===
--- testing-i686/depmod-search.conf (rev 0)
+++ testing-i686/depmod-search.conf 2012-03-03 05:10:17 UTC (rev 151797)
@@ -0,0 +1,5 @@
+#
+# /etc/depmod.d/depmod.conf
+#
+
+search updates extramodules built-in
Copied: kmod/repos/testing-x86_64/PKGBUILD (from rev 151796,
kmod/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-03-03 05:10:17 UTC (rev 151797)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Dave Reisner dreis...@archlinux.org
+
+pkgname=kmod
+pkgver=6
+pkgrel=1
+pkgdesc=Linux kernel module handling
+arch=('i686' 'x86_64')
+url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary'
+license=('GPL2')
+depends=('glibc' 'zlib')
+options=('!libtool')
+provides=('module-init-tools=3.16')
+conflicts=('module-init-tools')
+replaces=('module-init-tools')
+source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz;
+depmod-search.conf)
+md5sums=('bad08102fad212cd34405136d9a7eb94'
+ '4b8cbcbc54b9029c99fd730e257d4436')
+
+build() {
+ cd $pkgname-$pkgver
+
+ ./configure \
+--sysconfdir=/etc \
+--with-zlib
+
+ make
+}
+
+check() {
+ make -C $pkgname-$pkgver check
+}
+
+package() {
+ make -C $pkgname-$pkgver DESTDIR=$pkgdir install
+
+ # extra directories
+ install -dm755 $pkgdir/{etc,lib}/{depmod,modprobe}.d $pkgdir/sbin
+
+ # add symlinks to kmod
+ ln -s ../usr/bin/kmod $pkgdir/sbin/modprobe
+ ln -s ../usr/bin/kmod $pkgdir/sbin/depmod
+
+ for tool in {ins,ls,rm}mod modinfo; do
+ln -s kmod $pkgdir/usr/bin/$tool
+ done
+
+ # install depmod.d file for search/ dir
+ install -Dm644 $srcdir/depmod-search.conf
$pkgdir/lib/depmod.d/search.conf
+}
+
+# vim: ft=sh syn=sh et
Copied: kmod/repos/testing-x86_64/depmod-search.conf (from rev 151796,
kmod/trunk/depmod-search.conf)
===
--- testing-x86_64/depmod-search.conf (rev 0)
+++ testing-x86_64/depmod-search.conf 2012-03-03 05:10:17 UTC (rev 151797)
@@ -0,0 +1,5 @@
+#
+# /etc/depmod.d/depmod.conf
+#
+
+search updates extramodules built-in
[arch-commits] Commit in mlocate/trunk (PKGBUILD)
Date: Saturday, March 3, 2012 @ 00:53:25
Author: allan
Revision: 151798
upgpkg: mlocate 0.25-1
upstream update
Modified:
mlocate/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-03 05:10:17 UTC (rev 151797)
+++ PKGBUILD2012-03-03 05:53:25 UTC (rev 151798)
@@ -3,8 +3,8 @@
# Contributor: lydgate
pkgname=mlocate
-pkgver=0.24
-pkgrel=2
+pkgver=0.25
+pkgrel=1
pkgdesc=Faster merging drop-in for slocate
arch=('i686' 'x86_64')
url=http://carolina.mff.cuni.cz/~trmac/blog/mlocate;
@@ -19,7 +19,7 @@
source=(https://fedorahosted.org/releases/m/l/mlocate/mlocate-$pkgver.tar.xz
updatedb.conf
updatedb.cron.daily)
-md5sums=('a9c221e5bc489a2ed710c943990137bd'
+md5sums=('c6d043b170613b0e327a815b497f680a'
'c374ff223f2e07b5e602ba22359f2335'
'cde5da81bebad2de556ef2e43d895e13')
[arch-commits] Commit in mlocate/repos (10 files)
Date: Saturday, March 3, 2012 @ 00:54:38
Author: allan
Revision: 151799
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
mlocate/repos/testing-i686/
mlocate/repos/testing-i686/PKGBUILD
(from rev 151798, mlocate/trunk/PKGBUILD)
mlocate/repos/testing-i686/mlocate.install
(from rev 151798, mlocate/trunk/mlocate.install)
mlocate/repos/testing-i686/updatedb.conf
(from rev 151798, mlocate/trunk/updatedb.conf)
mlocate/repos/testing-i686/updatedb.cron.daily
(from rev 151798, mlocate/trunk/updatedb.cron.daily)
mlocate/repos/testing-x86_64/
mlocate/repos/testing-x86_64/PKGBUILD
(from rev 151798, mlocate/trunk/PKGBUILD)
mlocate/repos/testing-x86_64/mlocate.install
(from rev 151798, mlocate/trunk/mlocate.install)
mlocate/repos/testing-x86_64/updatedb.conf
(from rev 151798, mlocate/trunk/updatedb.conf)
mlocate/repos/testing-x86_64/updatedb.cron.daily
(from rev 151798, mlocate/trunk/updatedb.cron.daily)
+
testing-i686/PKGBUILD | 56 +++
testing-i686/mlocate.install | 18 +++
testing-i686/updatedb.conf |5 +++
testing-i686/updatedb.cron.daily | 29 ++
testing-x86_64/PKGBUILD| 56 +++
testing-x86_64/mlocate.install | 18 +++
testing-x86_64/updatedb.conf |5 +++
testing-x86_64/updatedb.cron.daily | 29 ++
8 files changed, 216 insertions(+)
Copied: mlocate/repos/testing-i686/PKGBUILD (from rev 151798,
mlocate/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-03-03 05:54:38 UTC (rev 151799)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Allan McRae al...@archlinux.org
+# Contributor: lydgate
+
+pkgname=mlocate
+pkgver=0.25
+pkgrel=1
+pkgdesc=Faster merging drop-in for slocate
+arch=('i686' 'x86_64')
+url=http://carolina.mff.cuni.cz/~trmac/blog/mlocate;
+license=('GPL')
+conflicts=('slocate')
+provides=('slocate')
+replaces=('slocate')
+depends=('glibc' 'coreutils' 'sh')
+backup=('etc/updatedb.conf'
+'etc/cron.daily/updatedb')
+install=mlocate.install
+source=(https://fedorahosted.org/releases/m/l/mlocate/mlocate-$pkgver.tar.xz
+ updatedb.conf
+ updatedb.cron.daily)
+md5sums=('c6d043b170613b0e327a815b497f680a'
+ 'c374ff223f2e07b5e602ba22359f2335'
+ 'cde5da81bebad2de556ef2e43d895e13')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ sed -i '/^groupname /s/mlocate/locate/' Makefile.in
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib
+ make
+
+}
+
+check() {
+ cd $srcdir/$pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+
+ # Set up a default updatedb.conf and a daily cronjob
+ install -Dm644 ${srcdir}/updatedb.conf $pkgdir/etc/updatedb.conf
+ install -Dm744 ${srcdir}/updatedb.cron.daily $pkgdir/etc/cron.daily/updatedb
+
+ # Install Mlocate
+ make DESTDIR=$pkgdir install
+
+ ln -sv locate $pkgdir/usr/bin/slocate
+ chgrp -v 21 $pkgdir/usr/bin/locate
+ chmod -v 2755 $pkgdir/usr/bin/locate
+
+ install -dm755 $pkgdir/var/lib
+ install -d -m750 -g21 $pkgdir/var/lib/locate
+}
Copied: mlocate/repos/testing-i686/mlocate.install (from rev 151798,
mlocate/trunk/mlocate.install)
===
--- testing-i686/mlocate.install(rev 0)
+++ testing-i686/mlocate.install2012-03-03 05:54:38 UTC (rev 151799)
@@ -0,0 +1,18 @@
+post_install() {
+ post_upgrade $1 $1
+ echo mlocate command is technically locate, but slocate is symlinked and
still works.
+ echo You should run updatedb as root.
+}
+
+post_upgrade() {
+ # This can be removed after {m,x}locate have both been updated
+ getent group slocate /dev/null usr/sbin/groupdel slocate /dev/null
+ getent group mlocate /dev/null usr/sbin/groupdel mlocate /dev/null
+
+ getent group locate /dev/null || usr/sbin/groupadd -g 21 locate /dev/null
+ chown -R root:locate var/lib/mlocate
+}
+
+pre_remove() {
+ getent group locate /dev/null usr/sbin/groupdel locate /dev/null
+}
Copied: mlocate/repos/testing-i686/updatedb.conf (from rev 151798,
mlocate/trunk/updatedb.conf)
===
--- testing-i686/updatedb.conf (rev 0)
+++ testing-i686/updatedb.conf 2012-03-03 05:54:38 UTC (rev 151799)
@@ -0,0 +1,5 @@
+# directories to exclude from the slocate database:
+PRUNEPATHS=/media /mnt /tmp /var/tmp /var/cache /var/lock /var/run /var/spool
+
+# filesystems to exclude from the slocate database:
+PRUNEFS=afs auto autofs binfmt_misc cifs coda configfs cramfs debugfs devpts
devtmpfs ftpfs iso9660 mqueue ncpfs nfs nfs4 proc ramfs securityfs shfs smbfs
sshfs sysfs tmpfs udf usbfs vboxsf
Copied:
