diff options
Diffstat (limited to 'abs/core')
121 files changed, 1314 insertions, 1517 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index 2289196..3821d1b 100644 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=2.2 -pkgrel=21 +pkgrel=27 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config ) pkgdesc="Install and configure your system" depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted' @@ -101,17 +101,17 @@ build() { install -m 0755 issue $startdir/pkg/etc/issue } -md5sums=('c1f6bd445284408767ab8ab4c4164aed' +md5sums=('c737f8538aea20fcb5f3903957e80837' '1a4694fcd694b362c339bda781ed0f3e' 'e36da536dd651ef182e7642337889e77' '985891a43f7c4c983eb2a362162f1a0f' 'd7a8cd4a0060399ae22e69f74e04eb07' - '7a45287a07145fde5aa664583d4f6fba' - 'f88d2fb88339a4bf8ec9217a3fbcdef7' + 'd705eb26cd25862bf0e84cc9964bd3db' + 'c20f73d4da5d7e15e1f3eb85c7dcb49a' '8ac1cfd2eca0f641737da0d0aca416a7' '9ae8d79f620c6d19973c55c32a921874' '95526b4d3dec6c9341088fb6511d831a' - 'bf32873c56d04c45ff0682f4e345e517' + 'ecf9e5df20683a769c4a8a8f2d65de85' 'e459ed069317bccb20351f037a9df3d2' '83be9a3bc72179909773479c74d13b38' '6aff504ed5e860adc1b7317cd0780900' diff --git a/abs/core/LinHES-config/install_functions.sh b/abs/core/LinHES-config/install_functions.sh index 83a2bed..8f24835 100755 --- a/abs/core/LinHES-config/install_functions.sh +++ b/abs/core/LinHES-config/install_functions.sh @@ -148,11 +148,11 @@ if [ $found_remote -eq 1 ] then scan_for_hpg_receiver fi -printhl " Scanning for TatIR" -if lsusb | grep 04d8:0004 > /dev/null 2>/dev/null -then - /usr/bin/PyroUsb.py > /dev/null 2>&1 & -fi +# printhl " Scanning for TatIR" +# if lsusb | grep 04d8:0004 > /dev/null 2>/dev/null +# then +# /usr/bin/PyroUsb.py > /dev/null 2>&1 & +# fi if [ $found_remote -eq 1 ] then diff --git a/abs/core/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py index 9dcc7b7..694a0b8 100755 --- a/abs/core/LinHES-config/mv_install.py +++ b/abs/core/LinHES-config/mv_install.py @@ -7,6 +7,7 @@ try: import parted except: print "module parted not found" + sys.exit(1) def usage(): print "help text:" diff --git a/abs/core/LinHES-config/systemconfig.sh b/abs/core/LinHES-config/systemconfig.sh index 218f705..dce8c74 100755 --- a/abs/core/LinHES-config/systemconfig.sh +++ b/abs/core/LinHES-config/systemconfig.sh @@ -10,6 +10,17 @@ echo "----------------------start of systemconfig $@ ----------------------" . $MV_ROOT/bin/networkconfig.sh postfix=`cat ${BASE}/usr/local/share/mythtv/.releasetype` +for i in larch liblarch larch-profiles larch-live +do + pacman -Q $i + if [ $? == 0 ] + then + pacman -R $i --noconfirm + fi +done + + sed -i '/larch/d' /etc/pacman.conf + systemconfig.py -m $@ rc=$? echo "systemconfig.py exit code $rc" diff --git a/abs/core/LinHES-config/timezip.py b/abs/core/LinHES-config/timezip.py index ca20921..4e494be 100755 --- a/abs/core/LinHES-config/timezip.py +++ b/abs/core/LinHES-config/timezip.py @@ -106,9 +106,10 @@ def selectvars(): result = cursor.fetchone() try: hobbitclient=result[0] - except TypeError: + except: + hobbitclient="1" + else: hobbitclient="1" - def insertvars(): @@ -184,7 +185,7 @@ def insertvars(): #hobbitclient cursor.execute("select * from settings where value='HostServiceHobbitclient' and hostname=(%s)",(thishostname)) result = cursor.fetchone() - if ( tz != ""): + if ( hobbitclient != ""): if (result == None): cursor.execute("INSERT INTO settings (value,data,hostname) VALUES ('HostServiceHobbitclient',(%s),(%s))",(hobbitclient,thishostname)) print "inserting hobbitcleint" diff --git a/abs/core/acl/PKGBUILD b/abs/core/acl/PKGBUILD index 099eb04..96c51fd 100644 --- a/abs/core/acl/PKGBUILD +++ b/abs/core/acl/PKGBUILD @@ -1,35 +1,34 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# $Id$ +# Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=acl -pkgver=2.2.47 -pkgrel=10 -pkgdesc="Library for filesystem ACL support" -arch=(i686 x86_64) -url="http://oss.sgi.com/projects/xfs/" +pkgver=2.2.51 +pkgrel=1 +pkgdesc="Access control list utilities, libraries and headers" +arch=('i686' 'x86_64') +url="http://savannah.nongnu.org/projects/acl" license=('LGPL') -groups=('base') -depends=('attr>=2.4.41') +depends=('attr>=2.4.46') replaces=('xfsacl') provides=('xfsacl') conflicts=('xfsacl') options=('!libtool') -source=(ftp://oss.sgi.com/projects/xfs/cmd_tars/acl_${pkgver}-1.tar.gz) -md5sums=('a11e4571a54a0b1ae83010d1e68a64c2') +source=(http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.src.tar.gz) +sha256sums=('06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225') build() { - cd $startdir/src/acl-$pkgver - autoconf - ./configure --prefix=$startdir/pkg/usr - make || return 1 - make prefix=$startdir/pkg/usr/ install install-lib install-dev + cd "${srcdir}"/${pkgname}-${pkgver} - # tidy up - cd $startdir/pkg + export INSTALL_USER=root INSTALL_GROUP=root + ./configure --prefix=/usr --libdir=/lib --libexecdir=/usr/lib + make +} - mkdir -v lib - mv -v usr/lib/libacl.so* lib/ - ln -sv ../../lib/libacl.so.1 usr/lib/libacl.so +package() { + cd "${srcdir}/${pkgname}-${pkgver}" - mv -v usr/libexec/libacl.{a,la} usr/lib/ - rm -rf $startdir/pkg/usr/libexec + make DIST_ROOT="${pkgdir}" install install-lib install-dev + + # tidy up + rm -f ${pkgdir}/lib/libacl.a + chmod 0755 ${pkgdir}/lib/libacl.so.*.*.* } diff --git a/abs/core/apr-util/PKGBUILD b/abs/core/apr-util/PKGBUILD index b44720c..0af3cc8 100644 --- a/abs/core/apr-util/PKGBUILD +++ b/abs/core/apr-util/PKGBUILD @@ -1,25 +1,28 @@ -# $Id: PKGBUILD 72241 2010-03-13 20:27:07Z jgc $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=apr-util -pkgver=1.3.9 -pkgrel=4 +pkgver=1.3.12 +pkgrel=2 pkgdesc="The Apache Portable Runtime" arch=('i686' 'x86_64') url="http://apr.apache.org/" -depends=('apr>=1.4.2' 'gdbm' 'expat' 'db>=4.8' 'libldap' 'unixodbc') +depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc') options=('!libtool') license=('APACHE') source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2") -md5sums=('29dd557f7bd891fc2bfdffcfa081db59') +md5sums=('0f671b037ca62751a8a7005578085560') build() { - cd "${srcdir}/apr-util-${pkgver}" + cd "${srcdir}/apr-util-${pkgver}" + ./configure --prefix=/usr --with-apr=/usr \ + --without-pgsql --without-mysql --without-sqlite2 --without-sqlite3 \ + --with-berkeley-db=/usr --with-gdbm=/usr --with-ldap + make +} - ./configure --prefix=/usr --with-apr=/usr \ - --without-pgsql --without-mysql --without-sqlite2 --without-sqlite3 \ - --with-berkeley-db=/usr --with-gdbm=/usr --with-ldap || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 +package() { + cd "${srcdir}/apr-util-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/abs/core/attr/PKGBUILD b/abs/core/attr/PKGBUILD index 5be563f..229f36f 100644 --- a/abs/core/attr/PKGBUILD +++ b/abs/core/attr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82618 2010-06-15 04:05:25Z allan $ +# $Id$ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=attr -pkgver=2.4.44 +pkgver=2.4.46 pkgrel=1 pkgdesc="Extended attribute support library for ACL support" -arch=(i686 x86_64) -url="http://oss.sgi.com/projects/xfs/" +arch=('i686' 'x86_64') +url="http://savannah.nongnu.org/projects/attr" license=('LGPL') depends=('glibc') makedepends=('gettext') @@ -13,24 +13,25 @@ replaces=('xfsattr') provides=('xfsattr') conflicts=('xfsattr') options=('!libtool') -source=(ftp://ftp.archlinux.org/other/attr/attr-${pkgver}.src.tar.gz) -sha256sums=('e01fa00686072a02dddf994e6217be950f51c1dc0852ad2e210c48b6e8de793a') +source=(http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.src.tar.gz) +sha256sums=('dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f') build() { - cd $srcdir/attr-$pkgver - autoconf - ./configure --prefix=/usr - sed -i -e 's/man2//g' man/Makefile - make || return 1 - make prefix=${pkgdir}/usr install install-lib install-dev + cd "${srcdir}"/${pkgname}-${pkgver} + + export INSTALL_USER=root INSTALL_GROUP=root + ./configure --prefix=/usr --libdir=/lib --libexecdir=/usr/lib + make +} - # tidy up - cd "${pkgdir}" +package() { + cd "${srcdir}"/${pkgname}-${pkgver} - mkdir -v lib - mv -v usr/lib/libattr.so* lib/ - ln -sv ../../lib/libattr.so.1 usr/lib/libattr.so + make DIST_ROOT="${pkgdir}" install install-lib install-dev - mv -v usr/libexec/libattr.{a,la} usr/lib/ - rm -rvf usr/libexec + # tidy up + rm -f "${pkgdir}"/lib/libattr.a + chmod 0755 "${pkgdir}"/lib/libattr.so.*.*.* + # remove conflicting manpages + rm -rf "${pkgdir}"/usr/share/man/man2 } diff --git a/abs/core/diffutils/PKGBUILD b/abs/core/diffutils/PKGBUILD index 6f0c432..6cf0ff4 100644 --- a/abs/core/diffutils/PKGBUILD +++ b/abs/core/diffutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 79537 2010-05-04 12:05:07Z allan $ +# $Id$ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=diffutils pkgver=3.0 -pkgrel=1 +pkgrel=2 pkgdesc="Utility programs used for creating patch files" arch=('i686' 'x86_64') url="http://www.gnu.org/software/diffutils" @@ -12,16 +12,16 @@ license=('GPL3') groups=('base') depends=('glibc' 'sh') install=diffutils.install -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz) +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz) md5sums=('7624eb7e6b53ea3ce38958a092d2216e') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr - make || return 1 + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/abs/core/ffmpeg-svn/PKGBUILD b/abs/core/ffmpeg-svn/PKGBUILD index 1e9ac93..6d3a132 100644 --- a/abs/core/ffmpeg-svn/PKGBUILD +++ b/abs/core/ffmpeg-svn/PKGBUILD @@ -4,15 +4,15 @@ # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg-svn -pkgver=26326 +pkgver=26402 pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64') url="http://ffmpeg.org/" license=('GPL') -depends=('bzip2' 'lame' 'sdl' 'libtheora' 'libvorbis' 'faac' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva>=1.0.4' 'openjpeg') -makedepends=('yasm') -options=('force') +depends=('bzip2' 'lame' 'sdl' 'libtheora' 'libvorbis' 'faac' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva>=1.0.4' 'openjpeg' 'rtmpdump') +makedepends=('yasm' 'subversion') +#epoch=1 provides=("ffmpeg=`date +%Y%m%d`") conflicts=('ffmpeg') @@ -31,9 +31,9 @@ build() { msg "SVN checkout done or server timeout" msg "Starting make..." - rm -rf "{$_svnmod}-build" - mkdir "${_svnmod}-build" - cd "${_svnmod}-build" + rm -rf "${srcdir}/${_svnmod}/{$_svnmod}-build" + mkdir -p "${srcdir}/${_svnmod}/${_svnmod}-build" + cd "${srcdir}/${_svnmod}/${_svnmod}-build" "${srcdir}/${_svnmod}/configure" \ --prefix=/usr \ @@ -53,6 +53,7 @@ build() { --enable-libopencore_amrwb \ --enable-libschroedinger \ --enable-libopenjpeg \ + --enable-librtmp \ --enable-version3 \ --enable-nonfree \ --enable-runtime-cpudetect \ @@ -63,7 +64,7 @@ build() { } package() { - cd "${srcdir}/${_svnmod}-build" + cd "${srcdir}/${_svnmod}/${_svnmod}-build" make DESTDIR="${pkgdir}" install || return 1 make DESTDIR="${pkgdir}" install-man || return 1 } diff --git a/abs/core/gdk-pixbuf/gdk-pixbuf-0.22.0-7.src.tar.gz b/abs/core/gdk-pixbuf/gdk-pixbuf-0.22.0-7.src.tar.gz deleted file mode 120000 index a56fab5..0000000 --- a/abs/core/gdk-pixbuf/gdk-pixbuf-0.22.0-7.src.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/packages/gdk-pixbuf-0.22.0-7.src.tar.gz
\ No newline at end of file diff --git a/abs/core/glib2/PKGBUILD b/abs/core/glib2/PKGBUILD index f1738b7..c3ec618 100644 --- a/abs/core/glib2/PKGBUILD +++ b/abs/core/glib2/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 99447 2010-11-14 19:35:34Z ibiru $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=glib2 -pkgver=2.26.1 +pkgver=2.28.8 pkgrel=1 -pkgdesc="Common C routines used by GTK+ 2.4 and other libs" +pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" arch=(i686 x86_64) license=('LGPL') -depends=('pcre>=8.02') +depends=('pcre>=8.12') makedepends=('pkgconfig' 'python2') +checkdepends=('pygobject' 'dbus-python') options=('!libtool' '!docs') -source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.26/glib-${pkgver}.tar.bz2 +source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.28/glib-${pkgver}.tar.xz glib2.sh glib2.csh) -sha256sums=('7a74ff12b6b9dee1f2d0e520b56b68b621920c4f4250bdf23468e515625c28d5' +sha256sums=('4d7ca95dbde8e8f60ab428c765b0dbb8a44be9eb9316491803ce5ee7b4748353' '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a' '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3') @@ -25,6 +26,10 @@ build() { --with-pcre=system \ --disable-fam make +} + +package() { + cd "${srcdir}/glib-${pkgver}" make DESTDIR="${pkgdir}" install install -d "${pkgdir}/etc/profile.d" @@ -35,3 +40,9 @@ build() { chmod -x "${_i}" done } + +check() { + cd "${srcdir}/glib-${pkgver}" + sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' gio/tests/gdbus-testserver.py + make -k check || true +} diff --git a/abs/core/grep/PKGBUILD b/abs/core/grep/PKGBUILD index ee4628f..918ef58 100644 --- a/abs/core/grep/PKGBUILD +++ b/abs/core/grep/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 91020 2010-09-21 03:26:36Z allan $ +# $Id$ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=grep -pkgver=2.7 +pkgver=2.9 pkgrel=1 pkgdesc="A string search utility" arch=('i686' 'x86_64') @@ -14,16 +14,20 @@ depends=('glibc' 'pcre' 'sh') makedepends=('texinfo') install=${pkgname}.install source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('6dd9931a52501519d7779a27cf953326') +md5sums=('25e41b2aa201104354740961ef36005a') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --bindir=/bin --without-included-regex - make || return 1 + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} make check } package() { cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install } diff --git a/abs/core/grep/grep.install b/abs/core/grep/grep.install index ba97d89..7cd3130 100644 --- a/abs/core/grep/grep.install +++ b/abs/core/grep/grep.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(grep.info) post_install() { diff --git a/abs/core/hdparm/PKGBUILD b/abs/core/hdparm/PKGBUILD index b68bffe..4bc267f 100644 --- a/abs/core/hdparm/PKGBUILD +++ b/abs/core/hdparm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 97491 2010-10-30 19:08:52Z tpowa $ +# $Id$ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=hdparm -pkgver=9.35 +pkgver=9.37 pkgrel=1 pkgdesc="A shell utility for manipulating Linux IDE drive/driver parameters" -arch=('i686' 'x86_64') +arch=(i686 x86_64) depends=('glibc') optdepends=('sh: required by idectl and ultrabayd') source=(http://downloads.sourceforge.net/sourceforge/hdparm/${pkgname}-${pkgver}.tar.gz @@ -14,31 +14,29 @@ license=('BSD') url="http://sourceforge.net/projects/hdparm/" optdepends=('bash: for wiper.sh script') options=('emptydirs') +md5sums=('0bb94ddd1bedd5c02b1ca62f1caaf6de' + '74e368f384166a7710b447573cda120a') build() { cd ${srcdir}/${pkgname}-${pkgver} - + # Fix Range input/output error when wiping Intel G2 and OCZ drives + patch -Np1 -i $srcdir/wiper.sh.2_6.max-ranges.patch + # build - make || return 1 + make } + package() { cd ${srcdir}/${pkgname}-${pkgver} - # install mkdir -p ${pkgdir}/{usr,sbin} make DESTDIR=${pkgdir} install install -m755 contrib/idectl ${pkgdir}/sbin install -m755 contrib/ultrabayd ${pkgdir}/sbin - # install wiper.sh script - # Fix Range input/output error when wiping Intel G2 and OCZ drives - patch -Np1 -i $srcdir/wiper.sh.2_6.max-ranges.patch - install -D -m 0644 $srcdir/$pkgname-$pkgver/wiper/README.txt $pkgdir/usr/share/doc/wiper/README.txt install -D -m 0755 $srcdir/$pkgname-$pkgver/wiper/wiper.sh $pkgdir/usr/sbin/wiper.sh #install license file install -D -m 644 LICENSE.TXT $pkgdir/usr/share/licenses/hdparm/LICENSE.TXT } -md5sums=('520996cc36b69212c3907df351296702' - '5b99485ee6881de8e009597bffba7eea') diff --git a/abs/core/hdparm/wiper.sh.2_6.max-ranges.patch b/abs/core/hdparm/wiper.sh.2_6.max-ranges.patch index 61d197b..c55f7b1 100644 --- a/abs/core/hdparm/wiper.sh.2_6.max-ranges.patch +++ b/abs/core/hdparm/wiper.sh.2_6.max-ranges.patch @@ -14,9 +14,9 @@ export verbose=0 commit="" +max_ranges=-1 + destroy_me="" argc=$# arg="" - while [ $argc -gt 0 ]; do @@ -51,6 +52,10 @@ commit=yes elif [ "$1" = "--verbose" ]; then diff --git a/abs/core/initscripts/PKGBUILD b/abs/core/initscripts/PKGBUILD index 0e07da3..98f7856 100644 --- a/abs/core/initscripts/PKGBUILD +++ b/abs/core/initscripts/PKGBUILD @@ -5,7 +5,7 @@ pkgname=initscripts pkgver=2011.06.4 -pkgrel=3 +pkgrel=4 pkgdesc="System initialization/bootup scripts" arch=('i686' 'x86_64') url="http://www.archlinux.org" @@ -20,7 +20,7 @@ optdepends=('bridge-utils: Network bridging support' 'wireless_tools: Wireless networking') install=initscripts.install source=("ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}.tar.xz" - 'wireless.conf.d' 'rc.sysinit.patch' 'rc.shutdown.patch' 'rc.multi.patch') + 'wireless.conf.d' 'rc.sysinit.patch' 'rc.shutdown.patch' 'rc.multi.patch' 'inittab.patch') @@ -31,6 +31,7 @@ package() { patch -p0 < ${srcdir}/rc.sysinit.patch || exit 1 patch -p0 < ${srcdir}/rc.shutdown.patch || exit 1 patch -p0 < ${srcdir}/rc.multi.patch || exit 1 + patch -p0 < ${srcdir}/inittab.patch || exit 1 make DESTDIR=${pkgdir} install install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless.example } @@ -38,4 +39,5 @@ md5sums=('34cbe55f3f42069c59237db935d0511b' '027576534885b8d5dded9be546057b12' 'eaa31b96513d834b50d116cb51f9ebbe' '73abaf06450104bddf16d409015f81ab' - 'a166ea014a1c75860b14fc98825686cc') + 'a166ea014a1c75860b14fc98825686cc' + '521bbd001633d14b08e5471bea584ee4') diff --git a/abs/core/initscripts/__changelog b/abs/core/initscripts/__changelog index 58bfd36..52f3642 100644 --- a/abs/core/initscripts/__changelog +++ b/abs/core/initscripts/__changelog @@ -1,7 +1,8 @@ -Patch init scripts +Patch init scripts (remove tty1, linhes header) patch -p0 < ${srcdir}/rc.sysinit.patch || exit 1 patch -p0 < ${srcdir}/rc.shutdown.patch || exit 1 patch -p0 < ${srcdir}/rc.multi.patch || exit 1 + patch -p0 < ${srcdir}/inittab.patch || exit 1 rename wireless.conf -> wireless.conf.example diff --git a/abs/core/initscripts/inittab.patch b/abs/core/initscripts/inittab.patch new file mode 100644 index 0000000..d92bfed --- /dev/null +++ b/abs/core/initscripts/inittab.patch @@ -0,0 +1,10 @@ +--- inittab.orig 2011-08-06 17:44:17.563781289 +0000 ++++ inittab 2011-08-06 17:44:36.440448743 +0000 +@@ -24,7 +24,6 @@ + su:S:wait:/sbin/sulogin -p + + # -8 options fixes umlauts problem on login +-c1:2345:respawn:/sbin/agetty -8 -s 38400 tty1 linux + c2:2345:respawn:/sbin/agetty -8 -s 38400 tty2 linux + c3:2345:respawn:/sbin/agetty -8 -s 38400 tty3 linux + c4:2345:respawn:/sbin/agetty -8 -s 38400 tty4 linux diff --git a/abs/core/jack/PKGBUILD b/abs/core/jack/PKGBUILD index 14cb175..e9f7898 100644 --- a/abs/core/jack/PKGBUILD +++ b/abs/core/jack/PKGBUILD @@ -1,37 +1,39 @@ -# $Id: PKGBUILD 86981 2010-08-08 11:15:35Z schiv $ -# Maintainer: tobias <tobias@archlinux.net> -# Maintainer: Ray Rashif <schivmeister@gmail.com> +# $Id$ +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: tobias <tobias@archlinux.net> # Contributor: Robert Emil Berge <robert@rebi.no> pkgname=jack _longname=jack-audio-connection-kit -pkgver=0.118.0 -pkgrel=4 +pkgver=0.121.2 +pkgrel=2 pkgdesc="A low-latency audio server" arch=('i686' 'x86_64') license=('GPL' 'LGPL') -depends=('libsamplerate') -makedepends=('doxygen' 'libffado') -optdepends=('libffado: FireWire support') +depends=('libsamplerate' 'readline') +makedepends=('doxygen' 'libffado' 'celt-0.7') +optdepends=('libffado: FireWire support' + 'celt-0.7: NetJACK driver') url="http://jackaudio.org/" options=('!libtool') -provides=("${_longname}=${pkgver}") -replaces=("${_longname}") +provides=("$_longname=$pkgver") +replaces=("$_longname") changelog=$pkgname.changelog -source=(http://jackaudio.org/downloads/${_longname}-${pkgver}.tar.gz) -md5sums=('d58e29a55f285d54e75134cec8e02a10') +source=("http://jackaudio.org/downloads/$_longname-$pkgver.tar.gz") +md5sums=('06c080349455afd4d217d6a8f9393e01') build() { - cd ${srcdir}/${_longname}-${pkgver} + cd "$srcdir/$_longname-$pkgver" - ./configure --prefix=/usr --libdir=/usr/lib - make || return 1 + ./configure --prefix=/usr \ + --libdir=/usr/lib + make } package() { - cd ${srcdir}/${_longname}-${pkgver} + cd "$srcdir/$_longname-$pkgver" - make DESTDIR=${pkgdir} install + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/abs/core/jack/jack.changelog b/abs/core/jack/jack.changelog index 6ad096e..54b9df6 100644 --- a/abs/core/jack/jack.changelog +++ b/abs/core/jack/jack.changelog @@ -1,7 +1,12 @@ -8 Aug 2010 (GMT+8) Ray Rashif <schivmeister@gmail.com> +29 Jul 2011 (GMT+8) Ray Rashif <schiv@archlinux.org> + + * 0.121.2-2: + Added celt support with celt-0.7 from community + Will not bring celt to extra as it's very unstable + +8 Aug 2010 (GMT+8) Ray Rashif <schiv@archlinux.org> * 0.118.0-4 : - Testing build. Built against libffado - for FireWire support (see FS#19626) Removed init scripts (no longer in tarball; unsupported). @@ -13,3 +18,4 @@ * jack.changelog : Added this changelog. + Only important changes will be logged. diff --git a/abs/core/libart-lgpl/PKGBUILD b/abs/core/libart-lgpl/PKGBUILD index f56c0b3..92d659f 100644 --- a/abs/core/libart-lgpl/PKGBUILD +++ b/abs/core/libart-lgpl/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libart-lgpl -pkgver=2.3.20 +pkgver=2.3.21 pkgrel=1 pkgdesc="A library for high-performance 2D graphics" url="http://www.levien.com/libart/" @@ -9,8 +9,8 @@ arch=(i686 x86_64) license=('LGPL') depends=('glibc') source=(http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-${pkgver}.tar.bz2) -md5sums=('d0ce67f2ebcef1e51a83136c69242a73') options=('!libtool') +sha256sums=('fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa') build() { cd ${startdir}/src/libart_lgpl-${pkgver} diff --git a/abs/core/libdrm/PKGBUILD b/abs/core/libdrm/PKGBUILD index b93c2dd..aa350d5 100644 --- a/abs/core/libdrm/PKGBUILD +++ b/abs/core/libdrm/PKGBUILD @@ -2,20 +2,20 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm -pkgver=2.4.25 +pkgver=2.4.26 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64) license=('custom') -depends=('glibc') +depends=('glibc' 'libpciaccess') options=('!libtool') url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 no-pthread-stubs.patch COPYING) -sha1sums=('b950f29cd1c4bb9f1c98a926486a47256b0a4194' - 'af2d9871565ea4cf524873f897691a18b2bba944' - 'ba3dcd636997ee0d30df14b03dae05c24ae5d094') +md5sums=('062569426773f69b11a47a7712bba770' + 'c722c8406507b7e3a8da7a3030d1d9cf' + 'ba65e71c481b94ef0fb6c23c7f21ffa1') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/abs/core/libdrm/no-pthread-stubs.patch b/abs/core/libdrm/no-pthread-stubs.patch index 6602f87..348c2a7 100644 --- a/abs/core/libdrm/no-pthread-stubs.patch +++ b/abs/core/libdrm/no-pthread-stubs.patch @@ -1,34 +1,35 @@ diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac --- libdrm-2.4.0/configure.ac 2008-10-09 21:57:09.000000000 +0200 +++ libdrm-2.4.0-nostubs/configure.ac 2008-10-21 10:48:24.000000000 +0200 -@@ -32,10 +32,6 @@ - AC_HEADER_STDC - AC_SYS_LARGEFILE +@@ -47,10 +47,6 @@ + LT_INIT([disable-static]) + -PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs) -AC_SUBST(PTHREADSTUBS_CFLAGS) -AC_SUBST(PTHREADSTUBS_LIBS) - - pkgconfigdir=${libdir}/pkgconfig - AC_SUBST(pkgconfigdir) - AC_ARG_ENABLE(udev, AS_HELP_STRING([--enable-udev], + PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) + AC_SUBST(PCIACCESS_CFLAGS) + AC_SUBST(PCIACCESS_LIBS) --- libdrm-2.4.16/intel/Makefile.am 2009-11-20 23:54:36.000000000 +0000 +++ libdrm-2.4.16/intel/Makefile.am.new 2009-12-07 08:11:32.235748069 +0000 -@@ -26,13 +26,12 @@ +@@ -26,14 +26,13 @@ $(WARN_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/intel \ - $(PTHREADSTUBS_CFLAGS) \ + $(PCIACCESS_CFLAGS) \ -I$(top_srcdir)/include/drm libdrm_intel_la_LTLIBRARIES = libdrm_intel.la libdrm_intel_ladir = $(libdir) libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined --libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @CLOCK_LIB@ -+libdrm_intel_la_LIBADD = ../libdrm.la @CLOCK_LIB@ +-libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @PCIACCESS_LIBS@ @CLOCK_LIB@ ++libdrm_intel_la_LIBADD = ../libdrm.la @PCIACCESS_LIBS@ @CLOCK_LIB@ libdrm_intel_la_SOURCES = \ - intel_atomic.h \ + intel_bufmgr.c \ --- libdrm-2.4.16/radeon/Makefile.am 2009-11-20 23:54:36.000000000 +0000 +++ libdrm-2.4.16/radeon/Makefile.am.new 2009-12-07 08:12:31.889075388 +0000 @@ -26,13 +26,12 @@ diff --git a/abs/core/libxft/PKGBUILD b/abs/core/libxft/PKGBUILD index 62bd015..4759400 100644 --- a/abs/core/libxft/PKGBUILD +++ b/abs/core/libxft/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 55090 2009-10-11 22:04:17Z andyrtr $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxft -pkgver=2.1.14 +pkgver=2.2.0 pkgrel=1 pkgdesc="FreeType-based font drawing library for X" arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org/" -depends=('fontconfig>=2.6.0' 'libxrender' 'sh') +depends=('fontconfig' 'libxrender') makedepends=('pkgconfig') options=('!libtool') source=(${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2) -md5sums=('254e62a233491e0e1251636536163e20') +sha1sums=('ed29784259f4e26df78141035560ae8a7c62e83f') build() { - cd ${startdir}/src/libXft-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc --disable-static || return 1 - make || return 1 - make DESTDIR=${startdir}/pkg install || return 1 - install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname} - install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1 + cd "${srcdir}/libXft-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --disable-static + make + make DESTDIR="${pkgdir}" install + install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/abs/core/libxi/PKGBUILD b/abs/core/libxi/PKGBUILD index 6abbf85..42fabdc 100644 --- a/abs/core/libxi/PKGBUILD +++ b/abs/core/libxi/PKGBUILD @@ -1,25 +1,29 @@ -# $Id: PKGBUILD 57676 2009-11-01 14:14:29Z jgc $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxi -pkgver=1.3 -pkgrel=2 +pkgver=1.4.3 +pkgrel=1 pkgdesc="X11 Input extension library" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org" -depends=('libxext>=1.1' 'inputproto>=2.0') -makedepends=('pkgconfig') -options=(!libtool force) +depends=('libxext' 'inputproto') +makedepends=('pkgconfig' 'xorg-util-macros') +options=(!libtool) license=('custom') source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2) -md5sums=('8df4ece9bd1efb02c28acb2b6f485e09') +sha1sums=('c66cfdee74e8d169a7992b5f257395e653ca761b') build() { cd "${srcdir}/libXi-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --sysconfdir=/etc --disable-static + make +} + +package() { + cd "${srcdir}/libXi-${pkgver}" + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/abs/core/libxrandr/PKGBUILD b/abs/core/libxrandr/PKGBUILD index 9c64cc8..8839b6b 100644 --- a/abs/core/libxrandr/PKGBUILD +++ b/abs/core/libxrandr/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 29289 2009-03-07 18:44:39Z jgc $ +# $Id$ # Maintainer: Alexander Baldeck <alexander@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=libxrandr -pkgver=1.3.0 +pkgver=1.3.2 pkgrel=1 pkgdesc="X11 RandR extension library" arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org/" -depends=('libxext>=1.0.5' 'libxrender' 'randrproto>=1.3.0') -makedepends=('pkgconfig') +depends=('libxext' 'libxrender' 'randrproto') +makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXrandr-${pkgver}.tar.bz2) -md5sums=('68eb59c3b7524db6ffd78746ee893d1d') +sha1sums=('0c844a4c5237f96794f0c18a5af16dc5ab7a36ec') build() { cd "${srcdir}/libXrandr-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --sysconfdir=/etc + make + make DESTDIR="${pkgdir}" install install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/abs/core/libxtst/PKGBUILD b/abs/core/libxtst/PKGBUILD index bcdf92d..be55b65 100644 --- a/abs/core/libxtst/PKGBUILD +++ b/abs/core/libxtst/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 97591 2010-10-31 16:11:54Z jgc $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxtst pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="X11 Testing -- Resource extension library" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -18,6 +18,10 @@ build() { cd "${srcdir}/libXtst-${pkgver}" ./configure --prefix=/usr --disable-static make +} + +package() { + cd "${srcdir}/libXtst-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD index 71a5961..076bac7 100644 --- a/abs/core/linhes-scripts/PKGBUILD +++ b/abs/core/linhes-scripts/PKGBUILD @@ -3,7 +3,7 @@ pkgname=linhes-scripts pkgver=7 -pkgrel=3 +pkgrel=4 pkgdesc="Various scripts that help to make LinHES, LinHES." arch=('i686' 'x86_64') license=('GPL2') @@ -58,7 +58,7 @@ build() { cp pause_mythcommflag ${pkgdir}/etc/logrotate.d/ } md5sums=('f56985b2d602e11dc1e10d3e7848b2a5' - '448f7ff4b4acc78e2ada919d8149d014' + '10ad1a4da669adccd01e0be6e5e4a3ed' '9ae2cd7a0c42d57ad8b5f515d7d60196' '1274bad3fb7296f00acd2d44804bad14' '47225fa9b6c953d56f6ede84d921a300' @@ -75,7 +75,7 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5' '15f3143d2b1369da431e4268029aba40' '3d0adf26280cde55a0c47188fff34826' '93aaa2940e33ec9ebb305b839ac46a3e' - '495e44151a06b2cc13e3fa103d6b4a1e' + 'b2c3dd48a4abb976eda2d5fbf22a173a' 'b527b01d119d3bc33b8fa69bdf1082bb' 'c537c44156d8404016cc4b405b092d45' '4e66f302a77f1a857476e7f289d0c157' diff --git a/abs/core/linhes-scripts/screenshooter.sh b/abs/core/linhes-scripts/screenshooter.sh index 72f6cc0..1cb7a78 100644..100755 --- a/abs/core/linhes-scripts/screenshooter.sh +++ b/abs/core/linhes-scripts/screenshooter.sh @@ -5,6 +5,9 @@ # Email: bob@stormlogic.com # # If you run into problems with this script, please send me email +# +# Maintained by Michael Hanson <mihanson@linhes.org> +# # This is alpha code to auto-generate thumbnails for previews in MythVideo. # It won't currently work on some filenames that have spaces in them. @@ -24,42 +27,44 @@ Usage() { echo "USAGE:" - echo `basename $0` "-v PATHNAME [-s SECONDS] [-c] [-b HOSTNAME] [-u USERNAME] [-p PASSWORD] [-o]" - echo "-v: pathname to Video" + echo `basename $0` "-f FILENAME [-s SECONDS] [-c] [-b HOSTNAME] [-u USERNAME] [-p PASSWORD] [-v]" + echo "-f: video filename" echo "-s: number of Seconds to skip before capturing (270 by default)" echo "-c: Clobber any previous screenshot found for this video (off by default)" - echo "-b: mysql server (Backend) hostname (localhost by default)" + echo "-b: mysql server (Backend) hostname (default: dbhost in /etc/systemconfig)" echo "-u: mysql Username (mythtv by default)" echo "-p: mysql Password (mythtv by default)" - echo "-o: verbOse mode (off by default)" + echo "-v: verbose mode (off by default)" echo "-x: check for valid video eXtension (off by default)" echo - echo "EXAMPLE: $0 -v /myth/video/HDTV/shuttle.mpg -c -s 30" + echo "EXAMPLE: $0 -f shuttle.mpg -c -s 30" exit 3 } +. /etc/systemconfig + if [ -z $1 ]; then Usage fi -V_MISSING=1 +F_MISSING=1 -while getopts "v:sbupochx" FLAG ; do +while getopts "f:sbupvcx" FLAG ; do case "$FLAG" in - v) VIDEO_PATHNAME="$OPTARG" - V_MISSING=0;; + f) FILENAME="$OPTARG" + F_MISSING=0;; s) SKIPAHEAD="$OPTARG";; c) CLOBBER=1;; b) BACKEND_HOSTNAME="$OPTARG";; u) DBUSERNAME="$OPTARG";; p) DBPASSWORD="$OPTARG";; - o) VERBOSE=1;; + v) VERBOSE=1;; x) EXTENSION_CHECK=1;; *) Usage;; esac done -if [ $V_MISSING == 1 ]; then +if [ $F_MISSING == 1 ]; then Usage fi @@ -68,82 +73,75 @@ fi # SKIPAHEAD is the number of seconds to skip ahead before starting the frame capture. # Set it to an arbitrary value if none is specified. SKIPAHEAD=${SKIPAHEAD:-"270"} -BACKEND_HOSTNAME=${BACKEND_HOSTNAME:-"localhost"} +BACKEND_HOSTNAME=${BACKEND_HOSTNAME:-${dbhost}} DBUSERNAME=${DBUSERNAME:-"mythtv"} DBPASSWORD=${DBPASSWORD:-"mythtv"} -# Defaults to quiet. -VERBOSE=${VERBOSE:-0} +# Defaults to quiet. +VERBOSE=${VERBOSE:-0} # Unless otherwise told, do not clobber existing cover files. CLOBBER=${CLOBBER:-0} # Unless otherwise told, do not check the file extension against # MythTV's list of registered video file types. EXTENSION_CHECK=${EXTENSION_CHECK:-0} -VIDEO_CAPTURE_HOME=$(mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -sNBe "select data from settings where value='VideoArtworkDir' limit 1") -if [ ! -d "$VIDEO_CAPTURE_HOME" ] ; then - echo "Directory $VIDEO_CAPTURE_HOME does not exist, nowhere to put the screen shot!" - echo "Have you configured MythVideo yet?" +SG_VIDEOS=$(mysql -u $DBUSERNAME -p$DBPASSWORD -h $BACKEND_HOSTNAME -D mythconverg -sNBe \ + "SELECT dirname FROM storagegroup WHERE groupname='Videos'") +if [ ! -d "${SG_VIDEOS}" ] ; then + echo "Directory $SG_VIDEOS does not exist, nowhere to put the screen shot!" + echo "Have you configured Storage Groups yet?" exit 1 fi -VIDEO_HOME=$(mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -sNBe "select data from settings where value='VideoStartupDir' limit 1") -if [ ! -d "$VIDEO_HOME" ] ; then - echo "Directory $VIDEO_HOME does not exist, nowhere to put the screen shot!" - echo "Have you configured MythVideo yet?" +SG_SCREEN=$(mysql -u $DBUSERNAME -p$DBPASSWORD -h $BACKEND_HOSTNAME -D mythconverg -sNBe \ + "SELECT dirname FROM storagegroup WHERE groupname='Screenshots'") +if [ ! -d "${SG_SCREEN}" ] ; then + echo "Directory $SG_SCREEN does not exist, nowhere to put the screen shot!" + echo "Have you configured Storage Groups yet?" exit 1 fi -VIDEO_FILENAME=$(basename "$VIDEO_PATHNAME") -VIDEO_EXTENSION=${VIDEO_FILENAME##*.} +VIDEO_EXTENSION=${FILENAME##*.} # Since we cron'd lets first make sure the validity of the file if [ "$EXTENSION_CHECK" == "1" ]; then - EXCHECK=$(mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -sNBe "select f_ignore from videotypes where extension=\"$VIDEO_EXTENSION\";") - #excheck returns blank, it found nothing. + EXCHECK=$(mysql -u $DBUSERNAME -p$DBPASSWORD -h $BACKEND_HOSTNAME -D mythconverg -sNBe "select f_ignore from videotypes where extension='${VIDEO_EXTENSION}';") + #excheck returns blank, it found nothing. if [ "$EXCHECK" == "" ]; then if [ "$VERBOSE" == "1" ]; then echo "$VIDEO_EXTENSION does not appear to be a valid media file, skipping." fi exit 1 - else + else # It is valid, but should we ignore it. If so then excheck will equal 1. - if [ "EXCHECK" == "1" ]; then + if [ "EXCHECK" == "1" ]; then if [ "$VERBOSE" == "1" ]; then echo "$VIDEO_EXTENSION is set to ignore." fi exit 1 fi - # It is valid, it's not set to ignore. + # It is valid, it's not set to ignore. if [ "$VERBOSE" == "1" ]; then echo "$VIDEO_EXTENSION appears in the Database, checking further." fi - EXCHECK=$(mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -sNBe "select title from videometadata where filename=\"$VIDEO_PATHNAME\";") + EXCHECK=$(mysql -u $DBUSERNAME -p$DBPASSWORD -h $BACKEND_HOSTNAME -D mythconverg -sNBe "select title from videometadata where filename LIKE '%${FILENAME}';") #Right, the file is supposed to be playable. Has it been imported to the Db yet? if [ "$EXCHECK" == "" ] ; then - if [ "$VERBOSE" == "1" ]; then + if [ "$VERBOSE" == "1" ]; then echo "$VIDEO_FILENAME does not exist in the database." - fi + fi exit 1 - # If you decide you want the system to 'auto import' the video then comment out - # the exit line and uncomment the rest of it. Bewarned, this is sucky SQL at - # the best but will give sensible defaults. - # - # if [ "$VERBOSE" == "1" ]; then - # echo "Importing $VIDEO_FILENAME in to database." - # fi - # mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -sNBe "insert into videometadata (intid, title, director, plot, rating, inetref, year, userrating, length, showlevel, filename, coverfile, childid, browse, playcommand, category) values (' ', '$VIDEO_FILENAME', 'Unknown', 'Unknown', 'NR', '00000000', 1895, 0.0, 0, 1, '$VIDEO_PATHNAME', 'No Cover', -1, 1, ' ', 0);" fi fi fi if [ "$CLOBBER" -eq 0 ]; then # Since we're not clobbering, first check to see if this video already has a coverfile entry in MySQL: - SQL_CMD="select coverfile from videometadata where filename=\"$VIDEO_PATHNAME\";" - CURRENT_COVERFILE=`mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -B -e "$SQL_CMD" | tail -1` - - if [[ "$CURRENT_COVERFILE" != "" ]] && [[ "$CURRENT_COVERFILE" != "No Cover" ]]; then + SQL_CMD="SELECT coverfile FROM videometadata WHERE filename LIKE '%${FILENAME}';" + CURRENT_COVERFILE=`mysql -u $DBUSERNAME -p$DBPASSWORD -h $BACKEND_HOSTNAME -D mythconverg -B -e "$SQL_CMD" | tail -1` + + if [[ "$CURRENT_COVERFILE" != "" ]] && [[ "$CURRENT_COVERFILE" != " " ]] && [[ "$CURRENT_COVERFILE" != "No Cover" ]]; then # there's already a cover file for this video - if [ "$VERBOSE" == "1" ]; then - echo "$VIDEO_FILENAME has cover file, skipping." + if [ "$VERBOSE" == "1" ]; then + echo "$FILENAME has cover file, skipping." fi exit 2 fi @@ -151,7 +149,7 @@ fi # Swap the video file extension for png. Should work assuming the extension only appears ONCE! -VIDEO_CAPTURE_PATHNAME="$VIDEO_CAPTURE_HOME/$VIDEO_FILENAME.png" +VIDEO_CAPTURE_PATHNAME="$SG_SCREEN/${FILENAME%.*}.png" # How many frames of video to capture. We'll grab the last frame as our screenshot. if [ "$VIDEO_EXTENSION" == "m4v" ]; then @@ -163,13 +161,17 @@ fi SHOTFILE="000000"$FRAMES_TO_CAPTURE".png" VIDEO_STATS="/tmp/screenshooter_video_stats.txt" +# Get the full path of the video file, less the storage group prefix +FULL_PATH=$(mysql -u $DBUSERNAME -p$DBPASSWORD -h $BACKEND_HOSTNAME -D mythconverg -sNBe \ + "SELECT filename FROM videometadata WHERE filename LIKE '%${FILENAME}';") + cd /tmp # The video we're processing may be shorter than SKIPAHEAD seconds. # Keep trying to capture until we find a SKIPAHEAD value within the length of the video. # Give up if we reach 0 seconds. while [ ! -f "$SHOTFILE" ]; do - /usr/bin/mplayer -ss $SKIPAHEAD -vf scale=640:-2 -ao null -vo png -quiet -frames $FRAMES_TO_CAPTURE -identify "$VIDEO_PATHNAME" &> $VIDEO_STATS & + /usr/bin/mplayer -ss $SKIPAHEAD -vf scale=640:-2 -ao null -vo png -quiet -frames $FRAMES_TO_CAPTURE -identify "$SG_VIDEOS/$FULL_PATH" &> $VIDEO_STATS & TIMEOUT=9 # Some video formats will play audio only. This loop gives the above command 20 seconds to @@ -182,7 +184,7 @@ while [ ! -f "$SHOTFILE" ]; do fi sleep 1 done - + SKIPAHEAD=$(expr $SKIPAHEAD / 2) if [ "$SKIPAHEAD" -le 0 ]; then break @@ -205,20 +207,18 @@ if [ -f "$SHOTFILE" ]; then VIDEO_LENGTH_IN_MINUTES=$(expr $VIDEO_LENGTH_IN_INTEGER_SECONDS / 60) fi - SQL_CMD="update videometadata set length=\"$MIN_LENGTH\" where filename=\"$VIDEO_PATHNAME\";" - mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -e "$SQL_CMD" + SQL_CMD="UPDATE videometadata SET length = '${MIN_LENGTH}' WHERE filename LIKE '%$FILENAME';" + mysql -u $DBUSERNAME -p$DBPASSWORD -h $BACKEND_HOSTNAME -D mythconverg -e "$SQL_CMD" - # put the screenshot pathname and any runlength info into videometadatatable - # Pre-escape any single or double quotes for the SQL command. VIDEO_CAPTURE_PATHNAME=`echo $VIDEO_CAPTURE_PATHNAME | sed -e "s/'/\\\'/g" -e 's/"/\\\"/g' ` - VIDEO_PATHNAME=`echo $VIDEO_PATHNAME | sed -e "s/'/\\\'/g" -e 's/"/\\\"/g' ` - SQL_CMD="update videometadata set coverfile=\"$VIDEO_CAPTURE_PATHNAME\", length=\"$VIDEO_LENGTH_IN_MINUTES\" where filename=\"$VIDEO_PATHNAME\";" + FILENAME=`echo $FILENAME | sed -e "s/'/\\\'/g" -e 's/"/\\\"/g' ` + SQL_CMD="UPDATE videometadata SET coverfile = '${VIDEO_CAPTURE_PATHNAME}', length = '${VIDEO_LENGTH_IN_MINUTES}' WHERE filename LIKE '%${FILENAME}';" - mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -e "$SQL_CMD" + mysql -u $DBUSERNAME -p$DBPASSWORD -h $BACKEND_HOSTNAME -D mythconverg -e "$SQL_CMD" else - echo "No image could be captured from $VIDEO_PATHNAME" + echo "No image could be captured from $FILENAME" exit 1 fi diff --git a/abs/core/linhes-scripts/screenshooter.sh.orig b/abs/core/linhes-scripts/screenshooter.sh.orig new file mode 100644 index 0000000..72f6cc0 --- /dev/null +++ b/abs/core/linhes-scripts/screenshooter.sh.orig @@ -0,0 +1,224 @@ +#!/bin/bash + +# Written by Bob Igo from the MythTV Store at http://MythiC.TV +# with contributions from TJC and Sarah Hayes +# Email: bob@stormlogic.com +# +# If you run into problems with this script, please send me email + +# This is alpha code to auto-generate thumbnails for previews in MythVideo. +# It won't currently work on some filenames that have spaces in them. +# It's surely just a matter of escaping or quoting, but I have yet to find +# the right incantation. + +# example usage: +# find -L /myth/video -wholename '*.covers' -prune -o -name '*.resume' -o -type f -exec screenshooter.sh -v {} \; + +# limitations: +# -- +# In an MBE/SBE/FE setup this might get the settings for the wrong machine... +# The script has no AI to know if a grabbed frame is useful to identify the video, only that it was able to grab it. +# Doesn't clean up after itself if videos are deleted, though MythTV may do this on its own. +# Minimum theoretical compatible video length is 4 seconds. Shorter videos will not work with this version. +# Surely more limitations I can't think of because it's my baby :) + +Usage() { + echo "USAGE:" + echo `basename $0` "-v PATHNAME [-s SECONDS] [-c] [-b HOSTNAME] [-u USERNAME] [-p PASSWORD] [-o]" + echo "-v: pathname to Video" + echo "-s: number of Seconds to skip before capturing (270 by default)" + echo "-c: Clobber any previous screenshot found for this video (off by default)" + echo "-b: mysql server (Backend) hostname (localhost by default)" + echo "-u: mysql Username (mythtv by default)" + echo "-p: mysql Password (mythtv by default)" + echo "-o: verbOse mode (off by default)" + echo "-x: check for valid video eXtension (off by default)" + echo + echo "EXAMPLE: $0 -v /myth/video/HDTV/shuttle.mpg -c -s 30" + exit 3 +} + +if [ -z $1 ]; then + Usage +fi + +V_MISSING=1 + +while getopts "v:sbupochx" FLAG ; do + case "$FLAG" in + v) VIDEO_PATHNAME="$OPTARG" + V_MISSING=0;; + s) SKIPAHEAD="$OPTARG";; + c) CLOBBER=1;; + b) BACKEND_HOSTNAME="$OPTARG";; + u) DBUSERNAME="$OPTARG";; + p) DBPASSWORD="$OPTARG";; + o) VERBOSE=1;; + x) EXTENSION_CHECK=1;; + *) Usage;; + esac +done + +if [ $V_MISSING == 1 ]; then + Usage +fi + +# Declaring Variables here and assigning sensible defaults. + +# SKIPAHEAD is the number of seconds to skip ahead before starting the frame capture. +# Set it to an arbitrary value if none is specified. +SKIPAHEAD=${SKIPAHEAD:-"270"} +BACKEND_HOSTNAME=${BACKEND_HOSTNAME:-"localhost"} +DBUSERNAME=${DBUSERNAME:-"mythtv"} +DBPASSWORD=${DBPASSWORD:-"mythtv"} +# Defaults to quiet. +VERBOSE=${VERBOSE:-0} +# Unless otherwise told, do not clobber existing cover files. +CLOBBER=${CLOBBER:-0} +# Unless otherwise told, do not check the file extension against +# MythTV's list of registered video file types. +EXTENSION_CHECK=${EXTENSION_CHECK:-0} + +VIDEO_CAPTURE_HOME=$(mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -sNBe "select data from settings where value='VideoArtworkDir' limit 1") +if [ ! -d "$VIDEO_CAPTURE_HOME" ] ; then + echo "Directory $VIDEO_CAPTURE_HOME does not exist, nowhere to put the screen shot!" + echo "Have you configured MythVideo yet?" + exit 1 +fi + +VIDEO_HOME=$(mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -sNBe "select data from settings where value='VideoStartupDir' limit 1") +if [ ! -d "$VIDEO_HOME" ] ; then + echo "Directory $VIDEO_HOME does not exist, nowhere to put the screen shot!" + echo "Have you configured MythVideo yet?" + exit 1 +fi + +VIDEO_FILENAME=$(basename "$VIDEO_PATHNAME") +VIDEO_EXTENSION=${VIDEO_FILENAME##*.} +# Since we cron'd lets first make sure the validity of the file +if [ "$EXTENSION_CHECK" == "1" ]; then + EXCHECK=$(mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -sNBe "select f_ignore from videotypes where extension=\"$VIDEO_EXTENSION\";") + #excheck returns blank, it found nothing. + if [ "$EXCHECK" == "" ]; then + if [ "$VERBOSE" == "1" ]; then + echo "$VIDEO_EXTENSION does not appear to be a valid media file, skipping." + fi + exit 1 + else + # It is valid, but should we ignore it. If so then excheck will equal 1. + if [ "EXCHECK" == "1" ]; then + if [ "$VERBOSE" == "1" ]; then + echo "$VIDEO_EXTENSION is set to ignore." + fi + exit 1 + fi + # It is valid, it's not set to ignore. + if [ "$VERBOSE" == "1" ]; then + echo "$VIDEO_EXTENSION appears in the Database, checking further." + fi + EXCHECK=$(mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -sNBe "select title from videometadata where filename=\"$VIDEO_PATHNAME\";") + #Right, the file is supposed to be playable. Has it been imported to the Db yet? + if [ "$EXCHECK" == "" ] ; then + if [ "$VERBOSE" == "1" ]; then + echo "$VIDEO_FILENAME does not exist in the database." + fi + exit 1 + # If you decide you want the system to 'auto import' the video then comment out + # the exit line and uncomment the rest of it. Bewarned, this is sucky SQL at + # the best but will give sensible defaults. + # + # if [ "$VERBOSE" == "1" ]; then + # echo "Importing $VIDEO_FILENAME in to database." + # fi + # mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -sNBe "insert into videometadata (intid, title, director, plot, rating, inetref, year, userrating, length, showlevel, filename, coverfile, childid, browse, playcommand, category) values (' ', '$VIDEO_FILENAME', 'Unknown', 'Unknown', 'NR', '00000000', 1895, 0.0, 0, 1, '$VIDEO_PATHNAME', 'No Cover', -1, 1, ' ', 0);" + fi + fi +fi + +if [ "$CLOBBER" -eq 0 ]; then + # Since we're not clobbering, first check to see if this video already has a coverfile entry in MySQL: + SQL_CMD="select coverfile from videometadata where filename=\"$VIDEO_PATHNAME\";" + CURRENT_COVERFILE=`mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -B -e "$SQL_CMD" | tail -1` + + if [[ "$CURRENT_COVERFILE" != "" ]] && [[ "$CURRENT_COVERFILE" != "No Cover" ]]; then + # there's already a cover file for this video + if [ "$VERBOSE" == "1" ]; then + echo "$VIDEO_FILENAME has cover file, skipping." + fi + exit 2 + fi +fi + + +# Swap the video file extension for png. Should work assuming the extension only appears ONCE! +VIDEO_CAPTURE_PATHNAME="$VIDEO_CAPTURE_HOME/$VIDEO_FILENAME.png" + +# How many frames of video to capture. We'll grab the last frame as our screenshot. +if [ "$VIDEO_EXTENSION" == "m4v" ]; then + FRAMES_TO_CAPTURE="90" +else + FRAMES_TO_CAPTURE="05" +fi + +SHOTFILE="000000"$FRAMES_TO_CAPTURE".png" +VIDEO_STATS="/tmp/screenshooter_video_stats.txt" + +cd /tmp + +# The video we're processing may be shorter than SKIPAHEAD seconds. +# Keep trying to capture until we find a SKIPAHEAD value within the length of the video. +# Give up if we reach 0 seconds. +while [ ! -f "$SHOTFILE" ]; do + /usr/bin/mplayer -ss $SKIPAHEAD -vf scale=640:-2 -ao null -vo png -quiet -frames $FRAMES_TO_CAPTURE -identify "$VIDEO_PATHNAME" &> $VIDEO_STATS & + TIMEOUT=9 + + # Some video formats will play audio only. This loop gives the above command 20 seconds to + # finish, otherwise it gets killed. + while [ -n "`ps -p $! --no-heading`" ]; do + TIMEOUT=$(expr $TIMEOUT - 1) + if [ "$TIMEOUT" -le 0 ]; then + kill -9 $! + break + fi + sleep 1 + done + + SKIPAHEAD=$(expr $SKIPAHEAD / 2) + if [ "$SKIPAHEAD" -le 0 ]; then + break + fi +done + +if [ -f "$SHOTFILE" ]; then + # Now, the video_capture is taken, and the name of the shot is in $SHOTFILE + # Rename it and move it to the place where video_captures live. + /bin/mv -f "$SHOTFILE" "$VIDEO_CAPTURE_PATHNAME" + /bin/rm -f 000000*png + chown mythtv: "$VIDEO_CAPTURE_PATHNAME" + + # We've got the shotfile nailed, now calculate video run length. + VIDEO_LENGTH_IN_SECONDS=`grep ID_LENGTH $VIDEO_STATS | awk -F'=' '{print $2}'` + VIDEO_LENGTH_IN_INTEGER_SECONDS=${VIDEO_LENGTH_IN_SECONDS/%.*/} + if [ $VIDEO_LENGTH_IN_INTEGER_SECONDS -lt 60 ]; then + VIDEO_LENGTH_IN_MINUTES="1" + else + VIDEO_LENGTH_IN_MINUTES=$(expr $VIDEO_LENGTH_IN_INTEGER_SECONDS / 60) + fi + + SQL_CMD="update videometadata set length=\"$MIN_LENGTH\" where filename=\"$VIDEO_PATHNAME\";" + mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -e "$SQL_CMD" + + + # put the screenshot pathname and any runlength info into videometadatatable + + # Pre-escape any single or double quotes for the SQL command. + + VIDEO_CAPTURE_PATHNAME=`echo $VIDEO_CAPTURE_PATHNAME | sed -e "s/'/\\\'/g" -e 's/"/\\\"/g' ` + VIDEO_PATHNAME=`echo $VIDEO_PATHNAME | sed -e "s/'/\\\'/g" -e 's/"/\\\"/g' ` + SQL_CMD="update videometadata set coverfile=\"$VIDEO_CAPTURE_PATHNAME\", length=\"$VIDEO_LENGTH_IN_MINUTES\" where filename=\"$VIDEO_PATHNAME\";" + + mysql -u $DBUSERNAME --password=$DBPASSWORD -h $BACKEND_HOSTNAME mythconverg -e "$SQL_CMD" +else + echo "No image could be captured from $VIDEO_PATHNAME" + exit 1 +fi diff --git a/abs/core/linhes-scripts/shootscreens.sh b/abs/core/linhes-scripts/shootscreens.sh index d3e8845..2d78e3c 100644..100755 --- a/abs/core/linhes-scripts/shootscreens.sh +++ b/abs/core/linhes-scripts/shootscreens.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -x # Written by Bob Igo from the MythTV Store at http://MythiC.TV # Email: bob@stormlogic.com @@ -34,4 +35,4 @@ fi killall -9 osd_cat osd_cat --barmode=percentage --percentage=100 --pos=middle --align=center --color=white --text="Video Thumbnails Generated!" --font=$FONT --shadow=3 --color=yellow --delay=3 & fi -}
\ No newline at end of file +} diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD index 13ca5cc..8b43941 100644 --- a/abs/core/linhes-theme/PKGBUILD +++ b/abs/core/linhes-theme/PKGBUILD @@ -2,18 +2,17 @@ # Maintainer: Cecil Watson<knoppmyth@gmail.com> pkgname=linhes-theme -pkgver=1 -pkgrel=13 +pkgver=1.4 +pkgrel=1 pkgdesc="Default LinHES theme." arch=('i686' 'x86_64') license=('GPL2') url="http://linhes.org/" -source=(ftp://ftp.knoppmyth.net/R6/sources/linhes-theme-1.3.tar.bz2) +source=(ftp://ftp.knoppmyth.net/R6/sources/linhes-theme-1.4.tar.bz2) build() { cd $startdir/src/ mkdir -p $startdir/pkg/usr/share/mythtv/themes cp -a LinHES $startdir/pkg/usr/share/mythtv/themes } - -md5sums=('e243d40c5e76f78b1d98ec038ebe2da5') +md5sums=('5f67ba0e244a1027c7d473b1a2b159fe') diff --git a/abs/core/lirc/lirc-0.9.0-5.src.tar.gz b/abs/core/lirc/lirc-0.9.0-5.src.tar.gz deleted file mode 120000 index c758f27..0000000 --- a/abs/core/lirc/lirc-0.9.0-5.src.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/packages/lirc-0.9.0-5.src.tar.gz
\ No newline at end of file diff --git a/abs/core/lvm2/ChangeLog b/abs/core/lvm2/ChangeLog deleted file mode 100644 index 5809ab5..0000000 --- a/abs/core/lvm2/ChangeLog +++ /dev/null @@ -1,103 +0,0 @@ -2010-07-11 Thomas Bächler <thomas@archlinux.org> - - * lvm2/device-mapper 2.02.70-1 - * Upstream update - * Do not move the dmeventd manpage, has been fixed upstream - * Remove all the || return 1 in PKGBUILD - -2010-07-01 Eric Belanger <eric@archlinux.org> - - * lvm2/device-mapper 2.02.69-1 - * Upstream update - * Moved dmeventd man page from lvm2 to device-mapper package - -2010-06-25 Eric Belanger <eric@archlinux.org> - - * lvm2/device-mapper 2.02.68-1 - * Upstream update - * Fixed tr path in lvmdump - -2010-04-05 Eric Belanger <eric@archlinux.org> - - * lvm2/device-mapper 2.02.62-1 - * Upstream update - * Fixed license - -2010-02-27 Eric Belanger <eric@archlinux.org> - - * lvm2/device-mapper 2.02.61-1 - * Upstream update - -2010-01-24 Thomas Bächler <thomas@archlinux.org> - * lvm2/device-mapper 2.02.60-2 - * Rebuilt without -Wl,--as-needed, it breaks dmeventd monitoring - -2010-01-24 Thomas Bächler <thomas@archlinux.org> - * lvm2/device-mapper update to 2.02.60-1 - * Clean up PKGBUILD, fix internal paths to dmeventd and its helpers - -2009-11-27 Eric Belanger <eric@archlinux.org> - - * lvm2 2.02.56-1 - * device-mapper 1.02.40-1 - * Upstream update - -2009-10-31 Eric Belanger <eric@archlinux.org> - - * lvm2 2.02.54-1 - * device-mapper 1.02.39-1 - * Upstream update - * Enabled the device-mapper event daemon - * Moved the udev rule from /etc to /lib - -2009-09-27 Eric Belanger <eric@archlinux.org> - - * lvm2 2.02.53-1 - * device-mapper 1.02.38-1 - * Upstream update - -2009-09-18 Eric Belanger <eric@archlinux.org> - - * lvm2 2.02.52-1 - * device-mapper 1.02.37-1 - * Upstream update - * Implemented split packages - * PKGBUILD clean up - * Renamed pkgconfig file (close FS#15909) - -2009-07-09 Eric Belanger <eric@archlinux.org> - - * lvm2 2.02.48-1 - * device-mapper 1.02.33-1 - * Upstream update - * Removed unneeded readline depends (close FS#15205) - -2009-05-24 Eric Belanger <eric@archlinux.org> - - * lvm2 2.02.47-1 - * device-mapper 1.02.32-1 - * Upstream update - * Added dmsetup.static - -2009-03-07 Eric Belanger <eric@archlinux.org> - - * lvm2 2.02.45-1 - * device-mapper 1.02.31-1 - * Upstream update - -2009-01-31 Eric Belanger <eric@archlinux.org> - - * lvm2 2.02.44-1 - * device-mapper 1.02.30-1 - * Upstream update - * Added bash depends - * Added readline depends - * Added pkgconfig file - -2008-11-11 Eric Belanger <eric@archlinux.org> - - * lvm2 2.02.43-1 - * device-mapper 1.02.29-1 - * Upstream update - * Disabled SMP build - * Added ChangeLog diff --git a/abs/core/lvm2/PKGBUILD b/abs/core/lvm2/PKGBUILD index 7c893c7..b54e9f6 100644 --- a/abs/core/lvm2/PKGBUILD +++ b/abs/core/lvm2/PKGBUILD @@ -1,20 +1,28 @@ -# $Id: PKGBUILD 97356 2010-10-30 01:06:16Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id$ +# Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') -pkgver=2.02.77 +pkgver=2.02.86 _pkgverlvm=${pkgver} pkgrel=1 arch=('i686' 'x86_64') url="http://sourceware.org/lvm2/" license=('GPL2' 'LGPL2.1') groups=('base') -conflicts=('mkinitcpio<0.5.99') source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz lvm2_install - lvm2_hook) + lvm2_hook + 11-dm-initramfs.rules) +md5sums=('3b42dec4d15ad106302a35149082a20e' + 'dcb82506d732cc7b10159a89b579dba8' + '8d613b84a175cd85f752a75198e40e15' + '69e40679cd8b3658bfc619e48baae125') +sha1sums=('f435b389cc11c8f415244fe382f3839d1676770c' + '7f108b2f2056eb050fc898bf5190ecf9145aed8a' + 'a0e0513c2efb183006e57e595d93ce18be297928' + 'f6a554eea9557c3c236df2943bb6e7e723945c41') build() { cd "${srcdir}/LVM2.${_pkgverlvm}" @@ -24,7 +32,7 @@ build() { --includedir=/usr/include --with-usrlibdir=/usr/lib \ --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \ --with-udevdir=/lib/udev/rules.d/ --enable-udev_sync --enable-udev_rules - make || return 1 + make } package_device-mapper() { @@ -34,12 +42,14 @@ package_device-mapper() { cd "${srcdir}/LVM2.${_pkgverlvm}" make DESTDIR="${pkgdir}" install_device-mapper + # extra udev rule for device-mapper in initramfs + install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/lib/initcpio/udev/11-dm-initramfs.rules" } package_lvm2() { pkgdesc="Logical Volume Manager 2 utilities" depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline') - conflicts=('lvm' 'mkinitcpio<0.5.99') + conflicts=('lvm' 'mkinitcpio<0.7') backup=('etc/lvm/lvm.conf') options=('!makeflags') @@ -55,6 +65,3 @@ package_lvm2() { install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/lib/initcpio/hooks/lvm2" install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/lib/initcpio/install/lvm2" } -md5sums=('e3cb5b86668ff08b337524f63ad82cde' - 'f781c9f5dd4f9934952c687b73d26a18' - '95bed25bdbc2c2d8500e7a07aeff7f65') diff --git a/abs/core/lvm2/lvm2_hook b/abs/core/lvm2/lvm2_hook index 13183c6..874b91d 100644 --- a/abs/core/lvm2/lvm2_hook +++ b/abs/core/lvm2/lvm2_hook @@ -4,7 +4,8 @@ run_hook () /sbin/modprobe -q dm-mod >/dev/null 2>&1 if [ -e "/sys/class/misc/device-mapper" ]; then if [ ! -e "/dev/mapper/control" ]; then - /bin/mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') + mkdir /dev/mapper + mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') fi # If the lvmwait= parameter has been specified on the command line @@ -17,9 +18,8 @@ run_hook () [ "${quiet}" = "y" ] && LVMQUIET=">/dev/null" - msg "Scanning logical volumes..." - eval /sbin/lvm vgscan --ignorelockingfailure $LVMQUIET msg "Activating logical volumes..." - eval /sbin/lvm vgchange --ignorelockingfailure --ignoremonitoring -ay $LVMQUIET + [ -d /etc/lvm ] && /sbin/lvm vgscan --sysinit + eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET fi } diff --git a/abs/core/lvm2/lvm2_install b/abs/core/lvm2/lvm2_install index 4ce9f18..94175b5 100644 --- a/abs/core/lvm2/lvm2_install +++ b/abs/core/lvm2/lvm2_install @@ -1,20 +1,19 @@ # vim: set ft=sh: -install () +build() { MODULES=" dm-mod dm-snapshot dm-mirror" BINARIES="" FILES="" SCRIPT="lvm2" - add_dir "/dev/mapper" add_binary "/sbin/lvm" add_binary "/sbin/dmsetup" - add_binary "/sbin/dmeventd" add_file "/lib/udev/rules.d/10-dm.rules" add_file "/lib/udev/rules.d/13-dm-disk.rules" add_file "/lib/udev/rules.d/95-dm-notify.rules" add_file "/lib/udev/rules.d/11-dm-lvm.rules" + add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules" } help () diff --git a/abs/core/mkinitcpio/PKGBUILD b/abs/core/mkinitcpio/PKGBUILD index c5b823d..69be999 100644 --- a/abs/core/mkinitcpio/PKGBUILD +++ b/abs/core/mkinitcpio/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 131019 2011-07-09 14:04:52Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> + pkgname=mkinitcpio pkgver=0.7.2 -pkgrel=1 +pkgrel=8 pkgdesc="Modular initramfs image creation utility" arch=(any) url="http://www.archlinux.org/" license=('GPL') -depends=('mkinitcpio-busybox>=1.16.1-2' 'module-init-tools' 'util-linux>=2.19' 'libarchive' 'coreutils' +depends=('mkinitcpio-busybox>=1.16.1-2' 'mkinitcpio-nfs-utils=>0.2' 'module-init-tools' 'util-linux>=2.19' 'libarchive' 'coreutils' 'bash' 'findutils' 'sed' 'grep' 'filesystem>=2009.01-2' 'udev>=171-2' 'file' 'gzip' 'which') optdepends=('xz: Use lzma or xz compression for the initramfs image' @@ -17,11 +17,14 @@ optdepends=('xz: Use lzma or xz compression for the initramfs image' 'mkinitcpio-nfs-utils: Support for root filesystem on NFS') replaces=('mkinitrd' 'mkinitramfs' 'klibc' 'klibc-extras' 'klibc-kbd' 'klibc-module-init-tools' 'klibc-udev') -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz) +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz mkinitcpio.conf.patch) backup=(etc/mkinitcpio.conf) -sha256sums=('b7282c78ef3144f5547a4012f334b0beb575b7108a5f6a006289a1e78aa9823d') package() { cd $srcdir/${pkgname}-${pkgver} + patch -p0 < $srcdir/mkinitcpio.conf.patch make DESTDIR="${pkgdir}" install } + +md5sums=('e11670a7d4802b2ef20cab4b3815168a' + 'b697144048288424b2380d044103ec34') diff --git a/abs/core/mkinitcpio/__changelog b/abs/core/mkinitcpio/__changelog new file mode 100644 index 0000000..c8dbb63 --- /dev/null +++ b/abs/core/mkinitcpio/__changelog @@ -0,0 +1,6 @@ +added "usb" and net to the modules line in mkinitcpio.conf ++HOOKS="base udev usb net autodetect pata scsi sata filesystems usbinput" + +MODULES="nfs" + +added depends: mkinitcpio-nfs-utils diff --git a/abs/core/mkinitcpio/mkinitcpio.conf.patch b/abs/core/mkinitcpio/mkinitcpio.conf.patch new file mode 100644 index 0000000..68ab648 --- /dev/null +++ b/abs/core/mkinitcpio/mkinitcpio.conf.patch @@ -0,0 +1,20 @@ +--- mkinitcpio.conf.orig 2011-08-06 00:04:15.991131194 +0000 ++++ mkinitcpio.conf 2011-08-06 00:04:02.791130644 +0000 +@@ -4,7 +4,7 @@ + # run. Advanced users may wish to specify all system modules + # in this array. For instance: + # MODULES="piix ide_disk reiserfs" +-MODULES="" ++MODULES="nfs" + + # BINARIES + # This setting includes any additional binaries a given user may +@@ -54,7 +54,7 @@ + # + ## This setup loads an lvm2 volume group on a usb device. + # HOOKS="base udev usb lvm2 filesystems" +-HOOKS="base udev autodetect pata scsi sata filesystems usbinput" ++HOOKS="base udev usb net autodetect pata scsi sata filesystems usbinput " + + # COMPRESSION + # Use this to compress the initramfs image. With kernels earlier than diff --git a/abs/core/mplayer/PKGBUILD b/abs/core/mplayer/PKGBUILD index 945a798..27cd4fb 100644 --- a/abs/core/mplayer/PKGBUILD +++ b/abs/core/mplayer/PKGBUILD @@ -1,55 +1,72 @@ -# $Id: PKGBUILD 97113 2010-10-26 14:11:03Z ibiru $ +# $Id$ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> -pkgname=mplayer -pkgver=32492 +pkgbase=mplayer +pkgname=('mplayer' 'mencoder') +pkgver=33805 pkgrel=2 -pkgdesc="A movie player for linux" arch=('i686' 'x86_64') -depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' - 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faac' 'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'libvdpau>=0.4' - 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx') +makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' +'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' +'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass') license=('GPL') url="http://www.mplayerhq.hu/" -makedepends=('unzip' 'mesa' 'live-media>=2010.01.13' 'yasm') -backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz mplayer.desktop mplayer.png) -md5sums=('01beb068608d3977fbb84b0b28935cee' - '647b9f4ab5284a7fef3f84f992214e77' - 'd00874ccc644b7f43d6ef1c942fcef28') +options=(!buildflags !emptydirs) +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz mplayer.desktop) +md5sums=('512a0309ba5979a41ae93b740f4592f4' + 'c0d6ef795cf6de48e3b87ff7c23f0319') build() { - # Custom CFLAGS break the mplayer build - unset CFLAGS LDFLAGS - - cd ${srcdir}/${pkgname} - - ./configure --prefix=/usr \ - --enable-runtime-cpudetection \ - --disable-gui \ - --disable-arts \ - --disable-liblzo \ - --disable-speex \ - --disable-openal \ - --disable-fribidi \ - --disable-libdv \ - --disable-musepack \ - --disable-esd \ - --disable-mga \ - --enable-xvmc \ - --language=all \ - --confdir=/etc/mplayer - - [ "$CARCH" = "i686" ] && sed 's|-march=i486|-march=i686|g' -i config.mak - - make - make -j1 DESTDIR=${pkgdir} install - install -Dm644 etc/{codecs.conf,input.conf,example.conf} ${pkgdir}/etc/mplayer/ - install -dm755 ${pkgdir}/usr/share/mplayer/ - ln -s /usr/share/fonts/TTF/DejaVuSans.ttf ${pkgdir}/usr/share/mplayer/subfont.ttf - rm -rf ${pkgdir}/usr/share/mplayer/font - #desktop file FS#14770 - install -Dm644 ${srcdir}/mplayer.desktop ${pkgdir}/usr/share/applications/mplayer.desktop - install -Dm644 ${srcdir}/mplayer.png ${pkgdir}/usr/share/pixmaps/mplayer.png + cd ${srcdir}/${pkgname} + + ./configure --prefix=/usr \ + --enable-runtime-cpudetection \ + --disable-gui \ + --disable-arts \ + --disable-liblzo \ + --disable-speex \ + --disable-openal \ + --disable-libdv \ + --disable-musepack \ + --disable-esd \ + --disable-mga \ + --disable-ass-internal \ + --disable-pulse \ + --enable-xvmc \ + --language=all \ + --confdir=/etc/mplayer + [ "$CARCH" = "i686" ] && sed 's|-march=i486|-march=i686|g' -i config.mak + + make +} + +package_mplayer() { + pkgdesc="A movie player for linux" + install=mplayer.install + backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') + depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' 'libgl' + 'libxinerama' 'libvdpau' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi' + 'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass') + + cd ${srcdir}/${pkgbase} + + make DESTDIR=${pkgdir} install-mplayer install-mplayer-man + install -Dm644 etc/{codecs.conf,input.conf,example.conf} ${pkgdir}/etc/mplayer/ + install -dm755 ${pkgdir}/usr/share/mplayer/ + ln -s /usr/share/fonts/TTF/DejaVuSans.ttf ${pkgdir}/usr/share/mplayer/subfont.ttf + rm -rf ${pkgdir}/usr/share/mplayer/font + #desktop file FS#14770 + install -Dm644 ${srcdir}/mplayer.desktop ${pkgdir}/usr/share/applications/mplayer.desktop + install -Dm644 etc/mplayer.png ${pkgdir}/usr/share/pixmaps/mplayer.png +} + +package_mencoder() { + pkgdesc="Free command line video decoding, encoding and filtering tool" + depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'cdparanoia' + 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2' 'schroedinger' 'mpg123' 'libass') + + cd ${srcdir}/${pkgbase} + make DESTDIR=${pkgdir} install-mencoder install-mencoder-man + find $pkgdir/usr/share/man -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \; } diff --git a/abs/core/mplayer/__changlog b/abs/core/mplayer/__changlog new file mode 100644 index 0000000..fdf7dab --- /dev/null +++ b/abs/core/mplayer/__changlog @@ -0,0 +1 @@ +-disable pulse and remove libpulse deps in PKGBUILD diff --git a/abs/core/mplayer/mplayer.desktop b/abs/core/mplayer/mplayer.desktop index e3229d0..07acea1 100644 --- a/abs/core/mplayer/mplayer.desktop +++ b/abs/core/mplayer/mplayer.desktop @@ -14,7 +14,7 @@ Comment[zh]=多媒体æ’放器 Comment[pl]=Odtwarzaj filmy i muzykÄ™ Icon=mplayer TryExec=mplayer -Exec=mplayer -really-quiet %F +Exec=mplayer %F Terminal=false NoDisplay=true Categories=GTK;AudioVideo;Audio;Video;Player;TV; diff --git a/abs/core/mplayer/mplayer.install b/abs/core/mplayer/mplayer.install new file mode 100644 index 0000000..660593c --- /dev/null +++ b/abs/core/mplayer/mplayer.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/abs/core/mythtv/stable-0.24/mythtv/mythtv-0.24-18.src.tar.gz b/abs/core/mythtv/stable-0.24/mythtv/mythtv-0.24-18.src.tar.gz deleted file mode 120000 index 0d26793..0000000 --- a/abs/core/mythtv/stable-0.24/mythtv/mythtv-0.24-18.src.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/packages/mythtv-0.24-18.src.tar.gz
\ No newline at end of file diff --git a/abs/core/nano/PKGBUILD b/abs/core/nano/PKGBUILD index 4b3b2d1..c58f7d1 100644 --- a/abs/core/nano/PKGBUILD +++ b/abs/core/nano/PKGBUILD @@ -1,25 +1,29 @@ -# $Id: PKGBUILD 87034 2010-08-09 17:54:43Z andyrtr $ +# $Id$ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Judd <judd@archlinux.org> pkgname=nano -pkgver=2.2.5 +pkgver=2.2.6 pkgrel=1 pkgdesc="Pico editor clone with enhancements" arch=('i686' 'x86_64') license=('GPL') url="http://www.nano-editor.org" groups=('base') -depends=('glibc' 'ncurses') -source=(http://www.nano-editor.org/dist/v2.2/nano-${pkgver}.tar.gz) -backup=(etc/nanorc) +depends=('ncurses' 'sh') +backup=('etc/nanorc') install=nano.install -md5sums=('77a10a49589f975ce98350a4527a2ebf') +source=(http://www.nano-editor.org/dist/v2.2/${pkgname}-${pkgver}.tar.gz) +md5sums=('03233ae480689a008eb98feb1b599807') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc --enable-color --enable-nanorc \ - --enable-multibuffer --disable-wrapping-as-root + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --enable-color \ + --enable-nanorc \ + --enable-multibuffer \ + --disable-wrapping-as-root make } diff --git a/abs/core/ntp/PKGBUILD b/abs/core/ntp/PKGBUILD index 69669c7..290b6b2 100755..100644 --- a/abs/core/ntp/PKGBUILD +++ b/abs/core/ntp/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 117473 2011-04-03 17:50:26Z andrea $ +# $Id$ # Maintainer: kevin <kevin@archlinux.org> pkgname=ntp diff --git a/abs/core/ntp/changelog b/abs/core/ntp/changelog index e69de29..528a078 100644 --- a/abs/core/ntp/changelog +++ b/abs/core/ntp/changelog @@ -0,0 +1,25 @@ +2011-04-03 andrea <andrea@archlinux.org> + + * ntp 4.2.6p3-3 + - Use 'ntpd -p' to get the PID in ntpd + - Don't run the ntp client in background in ntpdate + +2011-03-28 andrea <andrea@archlinux.org> + + * ntp 4.2.6p3-2 + - Improved daemon scripts + +2010-10-16 kevin <kevin@archlinux.org> + + * ntp 4.2.6p3 + - Implemented FS#18469, replace ntpdate with ntpd -q + - Removed LIBS + - Removed old IPv6 and nano patch + +2010-10-16 kevin <kevin@archlinux.org> + + * ntp 4.2.6p2 + - Added changelog + - Set LIBS to use librt since configure doesn't set it + - Convert PKGBUILD to build()/package() format + - removed "|| return 1" diff --git a/abs/core/ntp/fix-ipv6.patch b/abs/core/ntp/fix-ipv6.patch deleted file mode 100644 index eecd766..0000000 --- a/abs/core/ntp/fix-ipv6.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ntp-4.2.4p7-orig/configure.ac 2009-06-18 14:48:12.151346763 +0200 -+++ ntp-4.2.4p7/configure.ac 2009-06-18 14:50:07.054692531 +0200 -@@ -4456,6 +4456,7 @@ - [ - AC_LANG_PROGRAM( - [ -+ #define _GNU_SOURCE - #include <sys/types.h> - #include <sys/socket.h> - #include <netinet/in.h> diff --git a/abs/core/ntp/ntp-4.2.4_p7-nano.patch b/abs/core/ntp/ntp-4.2.4_p7-nano.patch deleted file mode 100644 index b31ea0a..0000000 --- a/abs/core/ntp/ntp-4.2.4_p7-nano.patch +++ /dev/null @@ -1,20 +0,0 @@ -http://bugs.gentoo.org/270483 - -ripped from fedora - ---- ntp-4.2.4p7/include/ntp_syscall.h -+++ ntp-4.2.4p7/include/ntp_syscall.h -@@ -14,5 +14,13 @@ - # include <sys/timex.h> - #endif - -+#if defined(ADJ_NANO) && !defined(MOD_NANO) -+#define MOD_NANO ADJ_NANO -+#endif -+ -+#if defined(ADJ_TAI) && !defined(MOD_TAI) -+#define MOD_TAI ADJ_TAI -+#endif -+ - #ifndef NTP_SYSCALLS_LIBC - #ifdef NTP_SYSCALLS_STD diff --git a/abs/core/ntp/ntp-client.conf b/abs/core/ntp/ntp-client.conf index e728db5..e728db5 100755..100644 --- a/abs/core/ntp/ntp-client.conf +++ b/abs/core/ntp/ntp-client.conf diff --git a/abs/core/ntp/ntp.conf b/abs/core/ntp/ntp.conf index 7f888e4..7f888e4 100755..100644 --- a/abs/core/ntp/ntp.conf +++ b/abs/core/ntp/ntp.conf diff --git a/abs/core/ntp/ntpd b/abs/core/ntp/ntpd index 825efc1..825efc1 100755..100644 --- a/abs/core/ntp/ntpd +++ b/abs/core/ntp/ntpd diff --git a/abs/core/ntp/ntpdate b/abs/core/ntp/ntpdate index 99508f4..99508f4 100755..100644 --- a/abs/core/ntp/ntpdate +++ b/abs/core/ntp/ntpdate diff --git a/abs/core/pacman/PKGBUILD b/abs/core/pacman/PKGBUILD index e25f7a7..80dabe4 100644 --- a/abs/core/pacman/PKGBUILD +++ b/abs/core/pacman/PKGBUILD @@ -3,7 +3,7 @@ pkgname=pacman pkgver=3.5.3 -pkgrel=4 +pkgrel=5 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64') url="http://www.archlinux.org/pacman/" diff --git a/abs/core/pacman/pacman-3.5.3-2.src.tar.gz b/abs/core/pacman/pacman-3.5.3-2.src.tar.gz deleted file mode 120000 index 3ed024f..0000000 --- a/abs/core/pacman/pacman-3.5.3-2.src.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/packages/pacman-3.5.3-2.src.tar.gz
\ No newline at end of file diff --git a/abs/core/pacman/pacman-3.5.3-3.src.tar.gz b/abs/core/pacman/pacman-3.5.3-3.src.tar.gz deleted file mode 120000 index 2736d3b..0000000 --- a/abs/core/pacman/pacman-3.5.3-3.src.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/packages/pacman-3.5.3-3.src.tar.gz
\ No newline at end of file diff --git a/abs/core/pacman/pacman-3.5.3-4.src.tar.gz b/abs/core/pacman/pacman-3.5.3-4.src.tar.gz deleted file mode 120000 index 1404e78..0000000 --- a/abs/core/pacman/pacman-3.5.3-4.src.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/packages/pacman-3.5.3-4.src.tar.gz
\ No newline at end of file diff --git a/abs/core/pacman/pacman.install b/abs/core/pacman/pacman.install index a3066bc..c066733 100644 --- a/abs/core/pacman/pacman.install +++ b/abs/core/pacman/pacman.install @@ -9,6 +9,7 @@ post_upgrade() { if [ "$(vercmp $2 3.5.0)" -lt 0 ]; then _warnupgrade fi + _updateconf echo ">>>" echo ">>> ATTENTION! ATTENTION! ATTENTION!" echo ">>> /etc/pacman.conf has changed. If you have customized your" @@ -18,6 +19,21 @@ post_upgrade() { echo ">>>" } +_updateconf() { + pacconf="/etc/pacman.conf" + #add SyncFirst + grep -q SyncFirst $pacconf + if [ $? -eq 1 ] + then + sed -i '/\[options\]/ a\SyncFirst = pacman ' $pacconf + fi + #remove larch + sed -i '/larch/d' $pacconf + +} + + + _warnupgrade() { echo ">>>" echo ">>> The pacman database format has changed as of pacman 3.5.0." diff --git a/abs/core/parted/parted-3.0-3.src.tar.gz b/abs/core/parted/parted-3.0-3.src.tar.gz deleted file mode 120000 index 0aea576..0000000 --- a/abs/core/parted/parted-3.0-3.src.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/packages/parted-3.0-3.src.tar.gz
\ No newline at end of file diff --git a/abs/core/pcre/ChangeLog b/abs/core/pcre/ChangeLog deleted file mode 100644 index cdff568..0000000 --- a/abs/core/pcre/ChangeLog +++ /dev/null @@ -1,40 +0,0 @@ -2010-03-24 Eric Belanger <eric@archlinux.org> - - * pcre 8.02-1 - * Upstream update - -2010-01-23 Eric Belanger <eric@archlinux.org> - - * pcre 8.01-1 - * Upstream update - -2009-10-26 Eric Belanger <eric@archlinux.org> - - * pcre 8.00-1 - * Upstream update - -2009-04-13 Eric Belanger <eric@archlinux.org> - - * pcre 7.9-1 - * Upstream update - -2008-10-19 Eric Belanger <eric@archlinux.org> - - * Updated url - -2008-09-05 Eric Belanger <eric@archlinux.org> - - * pcre 7.8-1 - * Upstream update - * Fixed license - -2008-07-07 Eric Belanger <eric@archlinux.org> - - * pcre 7.7-2 - * Added libpcre-7.7-buffer-overflow.patch to fix buffer overflow (close FS#10845) - -2008-05-10 Eric Belanger <eric@archlinux.org> - - * pcre 7.7-1 - * Upstream update - * Added ChangeLog diff --git a/abs/core/pcre/PKGBUILD b/abs/core/pcre/PKGBUILD index d31e23c..83dfe94 100644 --- a/abs/core/pcre/PKGBUILD +++ b/abs/core/pcre/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 84661 2010-07-03 04:01:39Z allan $ +# $Id$ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=pcre -pkgver=8.10 +pkgver=8.12 pkgrel=1 pkgdesc="A library that implements Perl 5-style regular expressions" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64') url="http://www.pcre.org/" license=('BSD') depends=('gcc-libs') options=('!libtool') source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2) -md5sums=('780867a700e9d4e4b9cb47aa5453e4b2') -sha1sums=('8b345da0f835b2caabff071b0b5bab40564652be') +md5sums=('f14a9fef3c92f3fc6c5ac92d7a2c7eb3') +sha1sums=('2219b372bff53ee29a7e44ecf5977ad15df01cea') build() { cd "${srcdir}"/${pkgname}-${pkgver} @@ -26,11 +26,11 @@ build() { package() { cd "${srcdir}"/${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install - + # grep uses pcre, so we need the libs in /lib install -dm755 "${pkgdir}"/lib mv "${pkgdir}"/usr/lib/libpcre.so.* "${pkgdir}"/lib/ - ln -sf ../../lib/libpcre.so.0 "${pkgdir}"/usr/lib/libpcre.so - + ln -sf /lib/libpcre.so.0 "${pkgdir}"/usr/lib/libpcre.so + install -Dm644 LICENCE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/abs/core/pcre/libpcre-7.7-buffer-overflow.patch b/abs/core/pcre/libpcre-7.7-buffer-overflow.patch deleted file mode 100644 index a27987f..0000000 --- a/abs/core/pcre/libpcre-7.7-buffer-overflow.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -NrU5 pcre-7.7.orig/pcre_compile.c pcre-7.7/pcre_compile.c ---- pcre-7.7.orig/pcre_compile.c 2008-06-18 17:08:49.000000000 +0200 -+++ pcre-7.7/pcre_compile.c 2008-06-18 17:11:04.000000000 +0200 -@@ -4929,11 +4929,11 @@ - { - if (code == cd->start_code + 1 + LINK_SIZE && - (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE)) - { - cd->external_options = newoptions; -- options = newoptions; -+ options = *optionsptr = newoptions; - } - else - { - if ((options & PCRE_IMS) != (newoptions & PCRE_IMS)) - { diff --git a/abs/core/perl_modules/perl-class-methodmaker/PKGBUILD b/abs/core/perl_modules/perl-class-methodmaker/PKGBUILD index 29da312..4b5ac7c 100644 --- a/abs/core/perl_modules/perl-class-methodmaker/PKGBUILD +++ b/abs/core/perl_modules/perl-class-methodmaker/PKGBUILD @@ -1,23 +1,24 @@ -# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-class-methodmaker -pkgver=2.11 -pkgrel=1 +pkgver=2.18 +pkgrel=4 pkgdesc="Create generic class methods" arch=('i686' 'x86_64') -url="http://search.cpan.org/~schwigon/Class-MethodMaker" +url="http://search.cpan.org/dist/Class-MethodMaker" license=('GPL' 'PerlArtistic') depends=('perl>=5.10.0') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/S/SC/SCHWIGON/class-methodmaker/Class-MethodMaker-$pkgver.tar.gz) +source=("http://search.cpan.org/CPAN/authors/id/S/SC/SCHWIGON/Class-MethodMaker-${pkgver}.tar.gz") +md5sums=('99435d78e0a1754b102fe39597c6c3df') build() { - cd $startdir/src/Class-MethodMaker-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=$startdir/pkg || return 1 - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete + cd $srcdir/Class-MethodMaker-$pkgver + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make install DESTDIR=$pkgdir + find $pkgdir -name '.packlist' -delete + find $pkgdir -name '*.pod' -delete } -md5sums=('61ed8327e50b99e574c5f5ce1a835d36') diff --git a/abs/core/perl_modules/perl-crypt-ssleay/PKGBUILD b/abs/core/perl_modules/perl-crypt-ssleay/PKGBUILD index f8ac29a..bc561d6 100644 --- a/abs/core/perl_modules/perl-crypt-ssleay/PKGBUILD +++ b/abs/core/perl_modules/perl-crypt-ssleay/PKGBUILD @@ -1,23 +1,31 @@ -# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman +# $Id$ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-crypt-ssleay -pkgver=0.57 +pkgver=0.58 pkgrel=3 pkgdesc="OpenSSL glue that provides LWP https support" arch=('i686' 'x86_64') -url="http://search.cpan.org/~DLAND/Crypt-SSLeay" +url="http://search.cpan.org/dist/Crypt-SSLeay" license=('GPL' 'PerlArtistic') -depends=('perl>=5.10.0') +depends=('openssl') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/D/DL/DLAND/Crypt-SSLeay-$pkgver.tar.gz) -md5sums=('82264180f5911dce33dbd85e24b1f36b') +source=(http://www.cpan.org/CPAN/authors/id/N/NA/NANIS/Crypt-SSLeay-$pkgver.tar.gz) +md5sums=('fbf3d12e58462cee00ea63239c0b13c7') build() { - cd $startdir/src/Crypt-SSLeay-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=$startdir/pkg || return 1 - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete + cd "${srcdir}/Crypt-SSLeay-${pkgver}" + + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd "${srcdir}/Crypt-SSLeay-${pkgver}" + make install DESTDIR="${pkgdir}" + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/abs/core/perl_modules/perl-dbi/PKGBUILD b/abs/core/perl_modules/perl-dbi/PKGBUILD index c6c5599..8bc53e3 100644 --- a/abs/core/perl_modules/perl-dbi/PKGBUILD +++ b/abs/core/perl_modules/perl-dbi/PKGBUILD @@ -1,28 +1,32 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: eric <eric@archlinux.org> +# $Id$ +# Maintainer: kevin <kevin@archlinux.org> # Contributor: Matt Thompson <mattt@defunct.ca> + pkgname=perl-dbi _realname=DBI -pkgver=1.601 -pkgrel=1 +pkgver=1.616 +pkgrel=2 pkgdesc="Database independent interface for Perl" arch=(i686 x86_64) license=('GPL' 'PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" -depends=('perl>=5.10.0') +depends=('perl>=5.12.1') options=(!emptydirs) source=(http://www.cpan.org/authors/id/T/TI/TIMB/${_realname}-${pkgver}.tar.gz) -md5sums=('d80677bd8113ec8cb0438b8703f3c418') +md5sums=('799313e54a693beb635b47918458f7c4') build() { - cd ${startdir}/src/${_realname}-${pkgver} + cd "${srcdir}/${_realname}-${pkgver}" + # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=${startdir}/pkg || return 1 + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} - # remove perllocal.pod and .packlist - find ${startdir}/pkg -name perllocal.pod -delete - find ${startdir}/pkg -name .packlist -delete +package() { + cd "${srcdir}/${_realname}-${pkgver}" + make install DESTDIR="${pkgdir}" } + # vim: ts=2 sw=2 et ft=sh diff --git a/abs/core/perl_modules/perl-digest-sha1/PKGBUILD b/abs/core/perl_modules/perl-digest-sha1/PKGBUILD index 7bf6976..d65b0d1 100644 --- a/abs/core/perl_modules/perl-digest-sha1/PKGBUILD +++ b/abs/core/perl_modules/perl-digest-sha1/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Kevin Piche <kevin@archlinux.org> +# $Id$ +# Maintainer: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-digest-sha1 _realname=Digest-SHA1 -pkgver=2.11 -pkgrel=4 -pkgdesc="Perl Module: Interface to the SHA-1 Algorithm." +pkgver=2.13 +pkgrel=2 +pkgdesc="Perl interface to the SHA-1 Algorithm" arch=(i686 x86_64) license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" @@ -15,17 +15,24 @@ options=(!emptydirs) source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) replaces=('digest-sha1') provides=('digest-sha1') -md5sums=('2449bfe21d6589c96eebf94dae24df6b') -groups=('shepherd-dep') +md5sums=('bd22388f268434f2b24f64e28bf1aa35') + build() { - cd ${startdir}/src/${_realname}-${pkgver} + cd ${srcdir}/${_realname}-${pkgver} + # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=${startdir}/pkg || return 1 + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd ${srcdir}/${_realname}-${pkgver} + + make install DESTDIR=${pkgdir} # remove perllocal.pod and .packlist - find ${startdir}/pkg -name perllocal.pod -delete - find ${startdir}/pkg -name .packlist -delete + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete } # vim: ts=2 sw=2 et ft=sh diff --git a/abs/core/perl_modules/perl-error/PKGBUILD b/abs/core/perl_modules/perl-error/PKGBUILD index c804210..2a4437c 100644 --- a/abs/core/perl_modules/perl-error/PKGBUILD +++ b/abs/core/perl_modules/perl-error/PKGBUILD @@ -1,27 +1,35 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# $Id$ # Maintainer: Dale Blount <dale@archlinux.org> # Contributor: Dale Blount <dale@archlinux.org> pkgname=perl-error _realname=Error -pkgver=0.17015 -pkgrel=1 +pkgver=0.17016 +pkgrel=2 pkgdesc="Perl/CPAN Error module - Error/exception handling in an OO-ish way" url="http://search.cpan.org/dist/${_realname}/" -arch=(i686 x86_64) +arch=(any) license=('PerlArtistic' 'GPL') depends=('perl>=5.10.0') options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/S/SH/SHLOMIF/${_realname}-${pkgver}.tar.gz) +md5sums=('eedcd3c6970568dd32092b5334328eff') build() { - cd ${startdir}/src/${_realname}-${pkgver} + cd ${srcdir}/${_realname}-${pkgver} # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=${startdir}/pkg || return 1 + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd ${srcdir}/${_realname}-${pkgver} + + make install DESTDIR=${pkgdir} # remove perllocal.pod and .packlist - find ${startdir}/pkg -name perllocal.pod -delete - find ${startdir}/pkg -name .packlist -delete + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete } + diff --git a/abs/core/perl_modules/perl-extutils-depends/PKGBUILD b/abs/core/perl_modules/perl-extutils-depends/PKGBUILD deleted file mode 100644 index 5e044d6..0000000 --- a/abs/core/perl_modules/perl-extutils-depends/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 46675 2009-07-19 15:31:27Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Sarah Hay <sarah@archlinux.org> -# Contributor: Arjan Timmerman <arjan@soulfly.nl> - -pkgname=perl-extutils-depends -_realname=ExtUtils-Depends -pkgver=0.302 -pkgrel=1 -pkgdesc="The Perl depends module" -arch=('i686' 'x86_64') -license=('PerlArtistic') -url="http://gtk2-perl.sourceforge.net/" -depends=('perl>=5.10.0') -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) -replaces=('extutils-depends') -options=('!emptydirs') -md5sums=('db46426f0599668da95c21b53b532508') - -build() { - cd ${srcdir}/${_realname}-${pkgver} - perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 -} -package() { - cd ${srcdir}/${_realname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name 'perllocal.pod' -delete -} diff --git a/abs/core/perl_modules/perl-extutils-pkgconfig/PKGBUILD b/abs/core/perl_modules/perl-extutils-pkgconfig/PKGBUILD deleted file mode 100644 index 4c575bc..0000000 --- a/abs/core/perl_modules/perl-extutils-pkgconfig/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 28969 2009-03-04 02:50:24Z kevin $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Sarah Hay <sarah@archlinux.org> -# Contributor: Arjan Timmerman <arjan@soulfly.nl> - -pkgname=perl-extutils-pkgconfig -_realname=ExtUtils-PkgConfig -pkgver=1.12 -pkgrel=1 -pkgdesc="The Perl Pkgconfig module" -arch=('i686' 'x86_64') -license=('LGPL') -url="http://gtk2-perl.sourceforge.net/" -depends=('perl>=5.10.0') -replaces=('extutils-pkgconfig') -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) -options=('!emptydirs') -md5sums=('8fc5c0b30cfda2048ec87ae418cc3508') - -build() { - cd ${srcdir}/${_realname}-${pkgver} - perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 -} -package() { - cd ${srcdir}/${_realname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name 'perllocal.pod' -delete -} diff --git a/abs/core/perl_modules/perl-html-parser/PKGBUILD b/abs/core/perl_modules/perl-html-parser/PKGBUILD index 43c3b8a..e507ceb 100644 --- a/abs/core/perl_modules/perl-html-parser/PKGBUILD +++ b/abs/core/perl_modules/perl-html-parser/PKGBUILD @@ -1,31 +1,31 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Kevin Piche <kevin@archlinux.org> +# $Id$ +# Maintainer: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis +# Contributor: Firmicus <francois.archlinux.org> pkgname=perl-html-parser _realname=HTML-Parser -pkgver=3.56 -pkgrel=3 +pkgver=3.68 +pkgrel=2 pkgdesc="Perl HTML parser class" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" -depends=('perl-html-tagset' 'perl>=5.10.0') +depends=('perl-html-tagset' 'perl>=5.12.1') options=(!emptydirs) -replaces=('html-parser') -provides=('html-parser') source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) -md5sums=('bddc432e5ed9df4d4153a62234f04fc2') +md5sums=('5550b2da7aa94341f1e8a17a4ac20c68') build() { - cd ${startdir}/src/${_realname}-${pkgver} + cd "${srcdir}/${_realname}-${pkgver}" # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor || return 1 - make MAN1EXT=1p MAN3EXT=3pm || return 1 - make install MAN1EXT=1p MAN3EXT=3pm DESTDIR=${startdir}/pkg || return 1 + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} - # remove perllocal.pod and .packlist - find ${startdir}/pkg -name perllocal.pod -delete - find ${startdir}/pkg -name .packlist -delete +package() { + cd "${srcdir}/${_realname}-${pkgver}" + make install DESTDIR="${pkgdir}" } # vim: ts=2 sw=2 et ft=sh diff --git a/abs/core/perl_modules/perl-html-tagset/PKGBUILD b/abs/core/perl_modules/perl-html-tagset/PKGBUILD index 047f39c..b7bb3bc 100644 --- a/abs/core/perl_modules/perl-html-tagset/PKGBUILD +++ b/abs/core/perl_modules/perl-html-tagset/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# $Id$ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-html-tagset _realname=HTML-Tagset -pkgver=3.10 -pkgrel=3 +pkgver=3.20 +pkgrel=2 pkgdesc="Data tables useful in parsing HTML" -arch=(i686 x86_64) +arch=(any) license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" depends=('perl>=5.10.0') @@ -15,17 +15,22 @@ replaces=('html-tagset') provides=('html-tagset') options=(!emptydirs) source=(http://www.cpan.org/authors/id/P/PE/PETDANCE/${_realname}-${pkgver}.tar.gz) -md5sums=('89bdd351272ccd285fa61c5b2ce451ab') +md5sums=('d2bfa18fe1904df7f683e96611e87437') build() { - cd ${startdir}/src/${_realname}-${pkgver} + cd ${srcdir}/${_realname}-${pkgver} # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make MAN1EXT=1p MAN3EXT=3pm || return 1 - make install MAN1EXT=1p MAN3EXT=3pm DESTDIR=${startdir}/pkg || return 1 + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd ${srcdir}/${_realname}-${pkgver} + make install DESTDIR=${pkgdir} # remove perllocal.pod and .packlist - find ${startdir}/pkg -name perllocal.pod -delete - find ${startdir}/pkg -name .packlist -delete + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete } # vim: ts=2 sw=2 et ft=sh diff --git a/abs/core/perl_modules/perl-mailtools/PKGBUILD b/abs/core/perl_modules/perl-mailtools/PKGBUILD index fae63ee..9c0271f 100644 --- a/abs/core/perl_modules/perl-mailtools/PKGBUILD +++ b/abs/core/perl_modules/perl-mailtools/PKGBUILD @@ -1,29 +1,32 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# $Id$ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Eric Johnson <eric@coding-zone.com> pkgname=perl-mailtools _realname=MailTools -pkgver=2.04 +pkgver=2.08 pkgrel=1 pkgdesc="Perl module that provides email tools" -arch=(i686 x86_64) +arch=(any) license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" depends=('perl>=5.10.0') options=(!emptydirs) source=(http://search.cpan.org/CPAN/authors/id/M/MA/MARKOV/${_realname}-${pkgver}.tar.gz) -md5sums=('d21ea4f375d1e5f3da6b0a4e8ba1e2c6') build() { - cd ${startdir}/src/${_realname}-${pkgver} + cd ${srcdir}/${_realname}-${pkgver} # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=${startdir}/pkg || return 1 + perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + cd ${srcdir}/${_realname}-${pkgver} + make install DESTDIR=${pkgdir} # remove perllocal.pod and .packlist - find ${startdir}/pkg -name perllocal.pod -delete - find ${startdir}/pkg -name .packlist -delete + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete } -# vim: ts=2 sw=2 et ft=sh +md5sums=('0245bf7985c6661e0cf31a59657a18f0') diff --git a/abs/core/perl_modules/perl-net-upnp/PKGBUILD b/abs/core/perl_modules/perl-net-upnp/PKGBUILD index 26db326..a49bd6e 100755..100644 --- a/abs/core/perl_modules/perl-net-upnp/PKGBUILD +++ b/abs/core/perl_modules/perl-net-upnp/PKGBUILD @@ -1,23 +1,27 @@ +# $Id$ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Drew Gilbert <gilbert dot drew at gmail dot com> + pkgname=perl-net-upnp -pkgver=1.4.1 -pkgrel=1 -pkgdesc="Net::UPnP::AV::MediaServer - Perl extension for UPnP." -arch=(i686 x86_64) -url="http://search.cpan.org/~sbeck/DateManip-$pkgver/" +pkgver=1.4.2 +pkgrel=3 +pkgdesc="Perl Module UPnP" +arch=('i686' 'x86_64') +url="http://search.cpan.org/~skonno/Net-UPnP-1.4.2/" +license=('BSD' 'PerlArtistic') +options=('!emptydirs') +source=("http://search.cpan.org/CPAN/authors/id/S/SK/SKONNO/Net-UPnP-${pkgver}.tar.gz") depends=('perl') -source=(http://search.cpan.org/CPAN/authors/id/S/SB/SBECK/DateManip-$pkgver.tar.gz) -source=http://search.cpan.org/CPAN/authors/id/S/SK/SKONNO/Net-UPnP-1.4.1.tar.gz +md5sums=('bc009fd76b565df40a70aca49af82a7d') + build() { - cd $startdir/src/Net-UPnP-$pkgver - # Force module installation to "current" perl directories. - /usr/bin/perl Makefile.PL \ - INSTALLARCHLIB=/usr/lib/perl5/current/${CARCH}-linux-thread-multi \ - INSTALLSITELIB=/usr/lib/perl5/site_perl/current \ - INSTALLSITEARCH=/usr/lib/perl5/site_perl/current/${CARCH}-linux-thread-multi - make || return 1 - make DESTDIR=$startdir/pkg install + cd "${srcdir}/Net-UPnP-${pkgver}" + + # install module in vendor directories. + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make install DESTDIR="${pkgdir}" - # remove perllocal.pod, .packlist, and empty dirs. - /bin/rm -rf $startdir/pkg/usr/lib/perl5/current - /bin/rm -rf $startdir/pkg/usr/lib/perl5/site_perl/current/${CARCH}-linux-thread-multi + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/abs/core/perl_modules/perl-net-upnp/perl-config-simple/PKGBUILD b/abs/core/perl_modules/perl-net-upnp/perl-config-simple/PKGBUILD deleted file mode 100644 index a566dbc..0000000 --- a/abs/core/perl_modules/perl-net-upnp/perl-config-simple/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Cecil H. Watson <knoppmyth@gmail.com - -pkgname=perl-config-simple -_realname=Config-Simple -pkgver=4.59 -pkgrel=1 -pkgdesc="Simple configuration file class for perl" -arch=(i686 x86_64) -license=('PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" -depends=('perlxml' 'perl>=5.10.0') -options=('!emptydirs') -source=(ftp://ftp.cpan.org/pub/CPAN/authors/id/S/SH/SHERZODR/${_realname}-${pkgver}.tar.gz) -md5sums=('96513b61c7db591339ce2577878a3b32') - -build() { - cd ${startdir}/src/${_realname}-${pkgver} - perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make DESTDIR=${startdir}/pkg install || return 1 - - find ${startdir}/pkg -name '.packlist' -delete - find ${startdir}/pkg -name 'perllocal.pod' -delete -} diff --git a/abs/core/perl_modules/perl-params-validate/PKGBUILD b/abs/core/perl_modules/perl-params-validate/PKGBUILD index f65387f..2dd4124 100644 --- a/abs/core/perl_modules/perl-params-validate/PKGBUILD +++ b/abs/core/perl_modules/perl-params-validate/PKGBUILD @@ -2,22 +2,29 @@ # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-params-validate -pkgver=0.91 -pkgrel=1 +pkgver=0.98 +pkgrel=2 pkgdesc="Validate sub params against a spec" arch=('i686' 'x86_64') -url="http://search.cpan.org/~DROLSKY/Params-Validate" +url="http://search.cpan.org/dist/Params-Validate" license=('GPL' 'PerlArtistic') -depends=('perl>=5.10.0') +depends=('perl') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/Params-Validate-$pkgver.tar.gz) -md5sums=('22c5467a1d4673374a1b7b2dbcfd473e') +source=("http://www.cpan.org/authors/id/D/DR/DROLSKY/Params-Validate-${pkgver}.tar.gz") +md5sums=('6dacb26b1bdb6338b6eed45cd86958bb') build() { - cd $startdir/src/Params-Validate-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=$startdir/pkg || return 1 - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete + cd Params-Validate-${pkgver} + + perl ./Build.PL --installdirs=vendor + + ./Build +} +package(){ + cd Params-Validate-${pkgver} + + ./Build install --destdir=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/abs/core/perl_modules/perl-term-readkey/PKGBUILD b/abs/core/perl_modules/perl-term-readkey/PKGBUILD index 4c4fdee..33397b2 100644 --- a/abs/core/perl_modules/perl-term-readkey/PKGBUILD +++ b/abs/core/perl_modules/perl-term-readkey/PKGBUILD @@ -1,28 +1,36 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# $Id$ +# Maintainer: kevin <kevin@archlinux.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> +# Contributor: Francois Charette <francois.archlinux.org> pkgname=perl-term-readkey -pkgver=2.30 -pkgrel=2 -pkgdesc="A perl module dedicated to providing simple control over terminal driver modes." +_realname=TermReadKey +pkgver=2.30.01 +pkgrel=4 +pkgdesc="Provides simple control over terminal driver modes" arch=('i686' 'x86_64') license=('custom') depends=('perl>=5.10.0' 'glibc') -url="http://cpan.org/modules/by-module/Term" -source=(http://cpan.org/modules/by-module/Term/TermReadKey-$pkgver.tar.gz) -md5sums=('f0ef2cea8acfbcc58d865c05b0c7e1ff') +url="http://search.cpan.org/~stsi/${_realname}/" +source=(http://search.cpan.org/CPAN/authors/id/S/ST/STSI/${_realname}-$pkgver.tar.gz) options=('!emptydirs') +md5sums=('6c099eddb76ec9b92179f1ed929be71a') + build() { - cd $startdir/src/TermReadKey-$pkgver - # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 - install -d $startdir/pkg/usr/share/licenses/$pkgname/ - head -7 README > $startdir/pkg/usr/share/licenses/$pkgname/LICENSE + cd ${srcdir}/TermReadKey-$pkgver + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd ${srcdir}/TermReadKey-$pkgver + make DESTDIR=${pkgdir} install + install -d ${pkgdir}/usr/share/licenses/$pkgname/ + head -7 README > ${pkgdir}/usr/share/licenses/$pkgname/LICENSE # remove perllocal.pod and .packlist - find ${startdir}/pkg -name perllocal.pod -delete - find ${startdir}/pkg -name .packlist -delete + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete } diff --git a/abs/core/perl_modules/perl-timedate/PKGBUILD b/abs/core/perl_modules/perl-timedate/PKGBUILD index fc72d6a..bd7d0e3 100644 --- a/abs/core/perl_modules/perl-timedate/PKGBUILD +++ b/abs/core/perl_modules/perl-timedate/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# $Id$ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-timedate _realname=TimeDate -pkgver=1.16 -pkgrel=3 +pkgver=1.20 +pkgrel=2 pkgdesc="Date formating subroutines" -arch=(i686 x86_64) +arch=(any) license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" depends=('perl>=5.10.0') @@ -15,18 +15,23 @@ source=(http://www.cpan.org/authors/id/G/GB/GBARR/${_realname}-${pkgver}.tar.gz) options=(!emptydirs) replaces=('timedate') provides=('timedate') -md5sums=('b3cc35a7cabd106ac8829d2f2ff4bd9d') +md5sums=('7da7452bce4c684e4238e6d09b390200') build() { - cd $startdir/src/${_realname}-${pkgver} + cd $srcdir/${_realname}-${pkgver} # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=${startdir}/pkg || return 1 + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd $srcdir/${_realname}-${pkgver} + make install DESTDIR=${pkgdir} # remove perllocal.pod and .packlist - find ${startdir}/pkg -name perllocal.pod -delete - find ${startdir}/pkg -name .packlist -delete + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete } # vim: ts=2 sw=2 et ft=sh diff --git a/abs/core/perl_modules/perl-tk/PKGBUILD b/abs/core/perl_modules/perl-tk/PKGBUILD index 7aa281d..21efbdb 100644 --- a/abs/core/perl_modules/perl-tk/PKGBUILD +++ b/abs/core/perl_modules/perl-tk/PKGBUILD @@ -1,40 +1,40 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Juergen Hoetzel <juergen@archlinux.org> +# $Id$ +# Maintainer: François Charette <francois ατ archlinux δοτ org> # Contributor: Jason Chu <jchu@xentac.net> +# Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=perl-tk -_realname=Tk -#stable pkgver=804.027 -pkgver=804.028 -pkgrel=2 -pkgdesc="This module/script allows perl to interface with tk" +_cpanname=Tk +pkgver=804.029 +pkgrel=3 +pkgdesc="A graphical user interface toolkit for Perl" +arch=('i686' 'x86_64') +url="http://search.cpan.org/dist/${_cpanname}" license=('PerlArtistic' 'GPL' 'custom') -arch=(i686 x86_64) -depends=('libx11' 'libpng' 'libjpeg' 'tk' 'perl>=5.10.0') -# -# Using an "unauthorized" version because the official -# release does not build under perl 5.10 -#source=(http://cpan.org/authors/id/N/NI/NI-S/${_realname}-${pkgver}.tar.gz) -# -source=(http://search.cpan.org/CPAN/authors/id/S/SR/SREZIC/${_realname}-${pkgver}.tar.gz) -md5sums=('7153c1c411b0dd005a0660179e5c5900') -url="http://search.cpan.org/dist/${_realname}/" -options=(!emptydirs) +depends=('libx11' 'libpng' 'libjpeg' 'tk' 'perl') +options=('!emptydirs') replaces=('perltk') provides=('perltk') +source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz) +md5sums=('f4aebe6fcdb309a8480514f2ccf8117c') build() { - cd ${startdir}/src/${_realname}-${pkgver} - - # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 + cd $srcdir/${_cpanname}-$pkgver + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor /bin/chmod -R u+w * - make || return 1 - make install DESTDIR=${startdir}/pkg || return 1 + # The Xlib header is wrong... + sed -i 's/XKeycodeToKeysym\(.*\)unsigned int/XKeycodeToKeysym\1KeyCode/' pTk/Xlib.h + make +} + +#check() { +# cd $srcdir/${_cpanname}-$pkgver +# make test +#} - # remove perllocal.pod and .packlist - find ${startdir}/pkg -name perllocal.pod -delete - find ${startdir}/pkg -name .packlist -delete +package() { + cd $srcdir/${_cpanname}-$pkgver + make install DESTDIR=$pkgdir # license install -D -m644 pTk/license.terms \ @@ -42,4 +42,3 @@ build() { install -D -m644 pTk/Tix.license \ ${startdir}/pkg/usr/share/licenses/${pkgname}/tix.license } -# vim: ts=2 sw=2 et ft=sh diff --git a/abs/core/perl_modules/perl-xml-libxslt/PKGBUILD b/abs/core/perl_modules/perl-xml-libxslt/PKGBUILD index 503e401..708898b 100644 --- a/abs/core/perl_modules/perl-xml-libxslt/PKGBUILD +++ b/abs/core/perl_modules/perl-xml-libxslt/PKGBUILD @@ -1,23 +1,30 @@ +# Id:$ # Maintainer: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-xml-libxslt -pkgver=1.68 -pkgrel=1 +pkgver=1.70 +pkgrel=6 pkgdesc="Interface to the gnome libxslt library " arch=('i686' 'x86_64') -url="http://search.cpan.org/~PAJAS/XML-LibXSLT" -license=('GPL' 'PerlArtistic') -depends=('perl-xml-libxml>=1.67' 'libxslt') -options=('!emptydirs') +url="http://search.cpan.org/dist/XML-LibXSLT" +license=('GPL') +depends=('perl-xml-libxml' 'libxslt') source=(http://www.cpan.org/authors/id/P/PA/PAJAS/XML-LibXSLT-$pkgver.tar.gz) -md5sums=('23265ad14469b3eede5833f205198a6f') +md5sums=('c63a7913999de076e5c911810f69b392') build() { cd $srcdir/XML-LibXSLT-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=$pkgdir || return 1 - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check () { + cd $srcdir/XML-LibXSLT-$pkgver + make test +} + +package() { + cd $srcdir/XML-LibXSLT-$pkgver + make install DESTDIR=$pkgdir } diff --git a/abs/core/perl_modules/perl-xml-twig/PKGBUILD b/abs/core/perl_modules/perl-xml-twig/PKGBUILD index b15b94b..b20735d 100644 --- a/abs/core/perl_modules/perl-xml-twig/PKGBUILD +++ b/abs/core/perl_modules/perl-xml-twig/PKGBUILD @@ -1,26 +1,28 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# $Id$ # Maintainer: damir <damir@archlinux.org> # Maintainer/Contributor: Francois Charette <firmicus@gmx.net> pkgname=perl-xml-twig _realname=XML-Twig -pkgver=3.32 -pkgrel=2 +pkgver=3.34 +pkgrel=3 pkgdesc="A module for easy processing of XML" -arch=('i686' 'x86_64') +arch=('any') url="http://search.cpan.org/dist/${_realname}/" license=('GPL' 'PerlArtistic') -depends=('perlxml>=2.23' 'perl-text-iconv' 'perl>=5.10.0') +depends=('perl-xml-parser>=2.23' 'perl-text-iconv' 'perl>=5.12.0') options=('!emptydirs') source=(http://www.cpan.org/authors/id/M/MI/MIROD/${_realname}-${pkgver}.tar.gz) -md5sums=('9df9dcab00aa093c4e540caa5cb759fa') +md5sums=('88a24e3e09b2fc1e252f7662d1291f9a') build() { - cd $startdir/src/${_realname}-${pkgver} - perl Makefile.PL -y INSTALLDIRS=vendor || return 1 - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 + cd "${srcdir}/${_realname}-${pkgver}" + perl Makefile.PL -y INSTALLDIRS=vendor + make + make test +} - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete +package() { + cd "${srcdir}/${_realname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/abs/core/pm-utils/02-logging-append.patch b/abs/core/pm-utils/02-logging-append.patch new file mode 100644 index 0000000..987e057 --- /dev/null +++ b/abs/core/pm-utils/02-logging-append.patch @@ -0,0 +1,19 @@ +Author: James Westby <james.westby@ubuntu.com> +Description: Do not clear the log file on each operation, but instead append to it. + This makes debugging of several suspends much easier. +Bug: https://bugs.freedesktop.org/show_bug.cgi?id=25255 +Bug-Ubuntu: https://launchpad.net/bugs/410352 + +Index: pm-utils/pm/pm-functions.in +=================================================================== +--- pm-utils.orig/pm/pm-functions.in 2010-07-05 18:41:21.118322244 +0200 ++++ pm-utils/pm/pm-functions.in 2010-07-05 18:41:24.126325221 +0200 +@@ -271,7 +271,7 @@ + return 1 + fi + export LOGGING=true +- exec > "$1" 2>&1 ++ exec >> "$1" 2>&1 + } + + check_suspend() { [ -n "$SUSPEND_MODULE" ]; } diff --git a/abs/core/pm-utils/12-fix-intel-audio-powersave-hook.patch b/abs/core/pm-utils/12-fix-intel-audio-powersave-hook.patch new file mode 100644 index 0000000..2d884da --- /dev/null +++ b/abs/core/pm-utils/12-fix-intel-audio-powersave-hook.patch @@ -0,0 +1,40 @@ +From: Florian Kriener <florian@kriener.org> +To: submit@bugs.debian.org +Subject: [pm-utils] wrong path in intel-audio-powersave (and a small bug) +Date: Sat, 25 Sep 2010 11:27:30 +0200 + +In the script intel-audio-powersave is this loop + +for dev in /sys/module/snd_*/parameters/power_save; do + [ -w "$dev/parameters/power_save" ] || continue + printf "Setting power savings for $s to %d..." "$dev##*/" "$1" + echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed. +done + +I think it should be + +for dev in /sys/module/snd_*; do + [ -w "$dev/parameters/power_save" ] || continue + printf "Setting power savings for %s to %d..." "${dev##*/}" "$1" + echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed. +done + + +This fixes the two bugs. + +diff --git a/pm/power.d/intel-audio-powersave b/pm/power.d/intel-audio-powersave +index 36675a8..da63e40 100644 +--- a/pm/power.d/intel-audio-powersave ++++ b/pm/power.d/intel-audio-powersave +@@ -20,9 +20,9 @@ EOF + + audio_powersave() { + [ "$INTEL_AUDIO_POWERSAVE" = "true" ] || exit $NA +- for dev in /sys/module/snd_*/parameters/power_save; do ++ for dev in /sys/module/snd_*; do + [ -w "$dev/parameters/power_save" ] || continue +- printf "Setting power savings for $s to %d..." "$dev##*/" "$1" ++ printf "Setting power savings for %s to %d..." "${dev##*/}" "$1" + echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed. + done + } diff --git a/abs/core/pm-utils/13-49bluetooth-sync.patch b/abs/core/pm-utils/13-49bluetooth-sync.patch new file mode 100644 index 0000000..b41f32c --- /dev/null +++ b/abs/core/pm-utils/13-49bluetooth-sync.patch @@ -0,0 +1,43 @@ +From 640b53438c20818b3e344343b58b1f1765606a85 Mon Sep 17 00:00:00 2001 +From: Martin Pitt <martin.pitt@ubuntu.com> +Date: Mon, 31 Jan 2011 15:30:01 +0100 +Subject: [PATCH] 49bluetooth: Wait for btusb module to get unused + +The 49bluetooth hook disables /proc/acpi/ibm/bluetooth but this isn't +synchronous, i. e. it doesn't wait until the module usage count actually drops +to 0. Due to that, it's impossible to add btusb to SUSPEND_MODULES (on some +models/older kernels you need to do that to fix suspend problems), as at that +point the module is still in use. + +On my system (ThinkPad X201) the module takes between 0.3 and 0.5 seconds to +unload, so use 100 ms wait steps with a timeout of 2 seconds. + +Bug: https://bugs.freedesktop.org//show_bug.cgi?id=33759 +Bug-Ubuntu: https://launchpad.net/bugs/698331 +--- + pm/sleep.d/49bluetooth | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/pm/sleep.d/49bluetooth b/pm/sleep.d/49bluetooth +index d46ba49..0dc1909 100755 +--- a/pm/sleep.d/49bluetooth ++++ b/pm/sleep.d/49bluetooth +@@ -12,6 +12,15 @@ suspend_bluetooth() + if grep -q enabled /proc/acpi/ibm/bluetooth; then + savestate ibm_bluetooth enable + echo disable > /proc/acpi/ibm/bluetooth ++ ++ # wait for up to 2 seconds for the module to actually get ++ # unused ++ TIMEOUT=20 ++ while [ $TIMEOUT -ge 0 ]; do ++ [ `cat /sys/module/btusb/refcnt` = 0 ] && break ++ TIMEOUT=$((TIMEOUT-1)) ++ sleep 0.1 ++ done + else + savestate ibm_bluetooth disable + fi +-- +1.7.2.3 + diff --git a/abs/core/pm-utils/14-disable-sata-alpm.patch b/abs/core/pm-utils/14-disable-sata-alpm.patch new file mode 100644 index 0000000..7b54949 --- /dev/null +++ b/abs/core/pm-utils/14-disable-sata-alpm.patch @@ -0,0 +1,26 @@ +Description: Disable SATA link power management by default, as it still causes disk errors and corruptions on many hardware. +Author: Martin Pitt <martin.pitt@ubuntu.com> +Bug-Ubuntu: https://launchpad.net/bugs/539467 + +Index: pm-utils/pm/power.d/sata_alpm +=================================================================== +--- pm-utils.orig/pm/power.d/sata_alpm 2011-02-01 15:53:09.164867778 +0100 ++++ pm-utils/pm/power.d/sata_alpm 2011-02-01 15:53:28.954867786 +0100 +@@ -2,7 +2,7 @@ + + . "${PM_FUNCTIONS}" + +-SATA_ALPM_ENABLE=${SATA_ALPM_ENABLE:-true} ++SATA_ALPM_ENABLE=${SATA_ALPM_ENABLE:-false} + + help() { + cat <<EOF +@@ -16,7 +16,7 @@ + + This hook has 1 parameter: + SATA_ALPM_ENABLE = whether to use SATA ALPM on battery. +-Defaults to "true". ++Defaults to "false". + + EOF + } diff --git a/abs/core/pm-utils/PKGBUILD b/abs/core/pm-utils/PKGBUILD index b0c71c4..6e2aed5 100644 --- a/abs/core/pm-utils/PKGBUILD +++ b/abs/core/pm-utils/PKGBUILD @@ -1,37 +1,48 @@ -# $Id: PKGBUILD 98218 2010-11-04 21:31:12Z ibiru $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=pm-utils pkgver=1.4.1 -pkgrel=1 +pkgrel=3 pkgdesc="Utilities and scripts for suspend and hibernate power management" arch=('i686' 'x86_64') url="http://pm-utils.freedesktop.org" license=('GPL') -depends=('bash' 'procps' 'vbetool' 'pm-quirks') -optdepends=('upower') +depends=('bash' 'procps' 'pm-quirks') makedepends=('xmlto' 'docbook-xml' 'docbook-xsl') source=(http://pm-utils.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz +02-logging-append.patch +12-fix-intel-audio-powersave-hook.patch +13-49bluetooth-sync.patch +14-disable-sata-alpm.patch 11netcfg) md5sums=('1742a556089c36c3a89eb1b957da5a60' + 'a45149617bf3eb8dc32e6d9e22ae715d' + 'edada31a7d722763513fbe705d95d19d' + '298f78b873c03c025700d5da619ac134' + 'd0040f7d30b6a0dd195b5401abbbbdb9' '9839687c8787d99fd4ff36aa3238c27b') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/02-logging-append.patch" + patch -Np1 -i "${srcdir}/12-fix-intel-audio-powersave-hook.patch" + patch -Np1 -i "${srcdir}/13-49bluetooth-sync.patch" + patch -Np1 -i "${srcdir}/14-disable-sata-alpm.patch" ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var - make || return 1 -} -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install || return 1 + make + make DESTDIR="${pkgdir}" install # install additional hooks install -m755 "${srcdir}/11netcfg" "${pkgdir}/usr/lib/pm-utils/sleep.d/" + # nm >=0.8.2 has native udev suspend/resume support rm -f "${pkgdir}/usr/lib/pm-utils/sleep.d/55NetworkManager" + + # Remove hooks that cause hardware failure or don't make sense at all + rm -f "${pkgdir}/usr/lib/pm-utils/power.d/"{harddrive,disable_wol} } diff --git a/abs/core/python_modules/python-geoip/PKGBUILD b/abs/core/python_modules/python-geoip/PKGBUILD index 7d69154..cd095c6 100644 --- a/abs/core/python_modules/python-geoip/PKGBUILD +++ b/abs/core/python_modules/python-geoip/PKGBUILD @@ -3,7 +3,7 @@ pkgname=python-geoip pkgver=1.2.4 -pkgrel=3 +pkgrel=4 pkgdesc="Python bindings for the GeoIP IP-to-country resolver library." arch=(i686 x86_64) url="http://www.maxmind.com/app/python" @@ -15,7 +15,7 @@ provides=('geoip-python') build() { cd ${startdir}/src/GeoIP-Python-${pkgver} - python2 setup.py build install --root=${startdir}/pkg + python2 setup.py build install --root=${pkgdir}/ } md5sums=('50f820d854476efaf3b7af733ffe4236') diff --git a/abs/core/python_modules/python-lxml/PKGBUILD b/abs/core/python_modules/python-lxml/PKGBUILD index 606ec54..df85c69 100644 --- a/abs/core/python_modules/python-lxml/PKGBUILD +++ b/abs/core/python_modules/python-lxml/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: $ +# $Id$ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> @@ -6,8 +6,8 @@ # Contributor: Guillem Rieu <guillemr@gmx.net> pkgname=python-lxml -pkgver=2.2.6 -pkgrel=4 +pkgver=2.3 +pkgrel=1 pkgdesc="Python binding for the libxml2 and libxslt libraries" arch=('i686' 'x86_64') license=('BSD' 'GPL' 'custom') @@ -16,19 +16,15 @@ depends=('python2' 'libxslt') optdepends=("beautiful-soup: support for parsing not well formed HTML") conflicts=('lxml') replaces=('lxml') -source=(http://codespeak.net/lxml/lxml-$pkgver.tgz) -md5sums=('b1f700fb22d7ee9b977ee3eceb65b20c') - -build() { - /bin/true -} +source=("http://codespeak.net/lxml/lxml-${pkgver}.tgz") +md5sums=('a245a015fd59b63e220005f263e1682a') package() { cd ${srcdir}/lxml-$pkgver - python2 setup.py install --root=${pkgdir} || return 1 + python2 setup.py install --root="${pkgdir}" --optimize=1 - install -D -m644 LICENSES.txt ${pkgdir}/usr/share/licenses/$pkgname/LICENSE || return 1 - install -D -m644 doc/licenses/BSD.txt ${pkgdir}/usr/share/licenses/$pkgname/BSD.txt || return 1 - install -D -m644 doc/licenses/elementtree.txt ${pkgdir}/usr/share/licenses/$pkgname/elementtree.txt || return 1 + install -D -m644 LICENSES.txt ${pkgdir}/usr/share/licenses/$pkgname/LICENSE + install -D -m644 doc/licenses/BSD.txt ${pkgdir}/usr/share/licenses/$pkgname/BSD.txt + install -D -m644 doc/licenses/elementtree.txt ${pkgdir}/usr/share/licenses/$pkgname/elementtree.txt } diff --git a/abs/core/python_modules/python-parted/PKGBUILD b/abs/core/python_modules/python-parted/PKGBUILD index 862405c..e00fa93 100644 --- a/abs/core/python_modules/python-parted/PKGBUILD +++ b/abs/core/python_modules/python-parted/PKGBUILD @@ -1,28 +1,17 @@ pkgname=python-parted __pkgname=pyparted -pkgver=2.0.12 -pkgver=3.4 +pkgver=3.8 pkgrel=4 pkgdesc="Python bindings for libparted" arch=('i686' 'x86_64') license=('LGPL' 'MPL') -depends=('python2' 'parted' 'python-decorator') +depends=('python2' 'parted=>3.0' 'python-decorator') options=('!libtool') source=(https://fedorahosted.org/releases/p/y/pyparted/pyparted-${pkgver}.tar.gz) url="https://fedorahosted.org/pyparted/" build() { cd "${srcdir}/${__pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 + python2 setup.py install --prefix=/usr --root="${pkgdir}" } -package(){ - cd "${srcdir}/${__pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 -} -md5sums=('8fc485db0b88e59bbdfc4be8ba4068fa') -md5sums=('cc064f12110a6f0d0c236ee7b18fee88') -md5sums=('f244958142c9fd3ff5ee95f578e2f76d') -md5sums=('7f5d06bd6336f3a699840d8639ab8a0d') -md5sums=('f244958142c9fd3ff5ee95f578e2f76d') -md5sums=('cc064f12110a6f0d0c236ee7b18fee88') +md5sums=('e9cd0c94c71ac17755f71a8e1561eac2') diff --git a/abs/core/qt/PKGBUILD b/abs/core/qt/PKGBUILD index e1ee827..9c2d93f 100644 --- a/abs/core/qt/PKGBUILD +++ b/abs/core/qt/PKGBUILD @@ -1,31 +1,30 @@ -# $Id: PKGBUILD 94734 2010-10-10 14:30:15Z andrea $ +# $Id$ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> -pkgname=qt -pkgver=4.7.0 -pkgrel=4 -pkgdesc='A cross-platform application and UI framework' +pkgbase=qt +pkgname=('qt' 'qt-private-headers') +pkgver=4.7.3 +pkgrel=3 arch=('i686' 'x86_64') url='http://qt.nokia.com/' license=('GPL3' 'LGPL') -depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus' - 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' - 'xdg-utils' 'hicolor-icon-theme') -optdepends=('postgresql-libs: PostgreSQL driver' - 'libmysqlclient: MySQL driver' - 'unixodbc: ODBC driver' - 'libxinerama: Xinerama support' - 'libxcursor: Xcursor support' - 'libxfixes: Xfixes support') -makedepends=('mesa' 'postgresql-libs' 'mysql' 'unixodbc' 'gtk2') -install="${pkgname}.install" +makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus' + 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' + 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs' + 'mysql' 'unixodbc' 'gtk2') options=('!libtool') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz" - 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop' - 'fix-scroll-when-last-item-is-removed.patch' - 'fix-multisampling-with-ati-card.patch') + 'assistant.desktop' 'designer.desktop' 'linguist.desktop' + 'qtconfig.desktop' + 'qtbug-16292.patch') +md5sums=('49b96eefb1224cc529af6fe5608654fe' + 'fc211414130ab2764132e7370f8e5caa' + '85179f5e0437514f8639957e1d8baf62' + 'f11852b97583610f3dbb669ebc3e21bc' + '6b771c8a81dd90b45e8a79afa0e5bbfd' + 'dc7ed8c2e8c68a175f7f05a34dccc937') build() { unset QMAKESPEC @@ -33,17 +32,19 @@ build() { export PATH=${QT4DIR}/bin:${PATH} export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} - cd $srcdir/$_pkgfqn + # FS#24601 + export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" - # Already fixed in 4.7.1 - patch -Np1 -i ${srcdir}/fix-scroll-when-last-item-is-removed.patch - patch -Np1 -i ${srcdir}/fix-multisampling-with-ati-card.patch + cd $srcdir/$_pkgfqn - sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf + # Already fixed upstream + patch -p1 -i "${srcdir}"/qtbug-16292.patch + + sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf - ./configure -v -confirm-license -opensource \ + ./configure -confirm-license -opensource \ -prefix /usr \ -docdir /usr/share/doc/qt \ -plugindir /usr/lib/qt/plugins \ @@ -86,8 +87,20 @@ build() { make } -package() { - cd $srcdir/$_pkgfqn +package_qt() { + pkgdesc='A cross-platform application and UI framework' + depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus' + 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' + 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils') + optdepends=('postgresql-libs: PostgreSQL driver' + 'libmysqlclient: MySQL driver' + 'unixodbc: ODBC driver' + 'libxinerama: Xinerama support' + 'libxcursor: Xcursor support' + 'libxfixes: Xfixes support') + install='qt.install' + + cd $srcdir/$_pkgfqn make INSTALL_ROOT=$pkgdir install # install missing icons and desktop files @@ -111,10 +124,20 @@ package() { find ${pkgdir}/usr/lib -type f -name '*.prl' \ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; } -md5sums=('3a2f25b9b115037277f4fb759194a7a5' - 'a445c6917086d80f1cfc1e40cb6b0132' - 'd457f0a0ad68a3861c3cadefe3b42ded' - '668331d9798a0e2b94381efb7be4c513' - 'c29f2993d6a0f73d756d2fa36e130e1c' - 'ef20c34afc5be5ed62f2935be66d9402' - 'b2e0f134bbb848ebef41134a45a36ee9') + +package_qt-private-headers(){ + pkgdesc="Qt private headers for development" + depends=("qt=${pkgver}") + + install -d ${pkgdir}/usr/include/{QtCore,QtDeclarative,QtGui,QtScript} + install -d ${pkgdir}/usr/src/{corelib,declarative,gui,script} + + for i in QtCore QtDeclarative QtGui QtScript; do + cp -r ${srcdir}/$_pkgfqn/include/${i}/private/ \ + ${pkgdir}/usr/include/${i}/ + done + + for i in corelib declarative gui script; do + cp -r ${srcdir}/$_pkgfqn/src/${i} ${pkgdir}/usr/src/ + done +} diff --git a/abs/core/qt/__changelog b/abs/core/qt/__changelog index d92474d..2abf977 100644 --- a/abs/core/qt/__changelog +++ b/abs/core/qt/__changelog @@ -1,4 +1 @@ remove cups support -added QtWebKit_Flash.patch to fix crash with Flash 10.1 and webkit browsers like mythbrowser. http://trac.webkit.org/changeset/61307 This shouldn't be needed in qt versions 4.6.4 or later. - -upgrade to 4.7.0 diff --git a/abs/core/qt/assistant.desktop b/abs/core/qt/assistant.desktop index 1b9f0a7..a9e98c4 100644 --- a/abs/core/qt/assistant.desktop +++ b/abs/core/qt/assistant.desktop @@ -1,8 +1,9 @@ [Desktop Entry] -Exec=/usr/bin/assistant Name=Qt Assistant -GenericName=Qt Document Browser +Comment=Shows Qt documentation and examples +Exec=/usr/bin/assistant Icon=assistant Terminal=false +Encoding=UTF-8 Type=Application -Categories=Qt;Development;Documentation +Categories=Qt;Development;Documentation; diff --git a/abs/core/qt/designer.desktop b/abs/core/qt/designer.desktop index 8f36273..9b7b6e9 100644 --- a/abs/core/qt/designer.desktop +++ b/abs/core/qt/designer.desktop @@ -1,9 +1,11 @@ [Desktop Entry] -Exec=/usr/bin/designer Name=Qt Designer GenericName=Interface Designer -MimeType=application/x-designer +Comment=Design GUIs for Qt applications +Exec=/usr/bin/designer Icon=designer +MimeType=application/x-designer; Terminal=false +Encoding=UTF-8 Type=Application -Categories=Qt;Development;GUIDesigner +Categories=Qt;Development; diff --git a/abs/core/qt/fix-multisampling-with-ati-card.patch b/abs/core/qt/fix-multisampling-with-ati-card.patch deleted file mode 100644 index c215c2c..0000000 --- a/abs/core/qt/fix-multisampling-with-ati-card.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e48e50c460434c451c67403390d98f7418c77cce Mon Sep 17 00:00:00 2001 -From: Jonathan Liu <net147@gmail.com> -Date: Wed, 25 Aug 2010 14:07:40 +1000 -Subject: [PATCH] Fix OpenGL multisampling for some graphics drivers - ---- - src/opengl/qgl_win.cpp | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/opengl/qgl_win.cpp b/src/opengl/qgl_win.cpp -index 5ab944a..8eb6177 100644 ---- a/src/opengl/qgl_win.cpp -+++ b/src/opengl/qgl_win.cpp -@@ -1042,7 +1042,7 @@ int QGLContext::choosePixelFormat(void* dummyPfd, HDC pdc) - iAttributes[i++] = WGL_DRAW_TO_WINDOW_ARB; - iAttributes[i++] = TRUE; - iAttributes[i++] = WGL_COLOR_BITS_ARB; -- iAttributes[i++] = 32; -+ iAttributes[i++] = 24; - iAttributes[i++] = WGL_DOUBLE_BUFFER_ARB; - iAttributes[i++] = d->glFormat.doubleBuffer(); - if (d->glFormat.stereo()) { --- -1.7.2.1 - diff --git a/abs/core/qt/fix-scroll-when-last-item-is-removed.patch b/abs/core/qt/fix-scroll-when-last-item-is-removed.patch deleted file mode 100644 index 8656702..0000000 --- a/abs/core/qt/fix-scroll-when-last-item-is-removed.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 6da6b7099d4e0b49329793e4b90703ec3d868048 Mon Sep 17 00:00:00 2001 -From: Frank Reininghaus <frank78ac@googlemail.com> -Date: Wed, 22 Sep 2010 10:19:59 +0200 -Subject: [PATCH] QTreeView: do not scroll to top if last item is removed - -When the last item is the current item and is removed, -QTreeViewPrivate::updateScrollBars() is called after QTreeViewPrivate's -viewItems member is cleared. This commit makes sure that viewItems is -restored by calling QTreeView::doItemsLayout() in this case, preventing -that the scroll bar range is set to zero temporarily and the view is -scrolled to the top unexpectedly (this was a regression in 4.7.0: -QTBUG-13567). - -Merge-request: 2481 -Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> ---- - src/gui/itemviews/qtreeview.cpp | 4 ++++ - tests/auto/qtreeview/tst_qtreeview.cpp | 22 ++++++++++++++++++++++ - 2 files changed, 26 insertions(+), 0 deletions(-) - -diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp -index b797776..40b51fe 100644 ---- a/src/gui/itemviews/qtreeview.cpp -+++ b/src/gui/itemviews/qtreeview.cpp -@@ -3435,6 +3435,10 @@ void QTreeViewPrivate::updateScrollBars() - if (!viewportSize.isValid()) - viewportSize = QSize(0, 0); - -+ if (viewItems.isEmpty()) { -+ q->doItemsLayout(); -+ } -+ - int itemsInViewport = 0; - if (uniformRowHeights) { - if (defaultItemHeight <= 0) --- -1.6.1 - diff --git a/abs/core/qt/linguist.desktop b/abs/core/qt/linguist.desktop index 94e92c1..8cbe865 100644 --- a/abs/core/qt/linguist.desktop +++ b/abs/core/qt/linguist.desktop @@ -1,9 +1,10 @@ [Desktop Entry] -Exec=/usr/bin/linguist Name=Qt Linguist -GenericName=Translation Tool -MimeType=application/x-linguist +Comment=Add translations to Qt applications +Exec=/usr/bin/linguist +Icon=linguist +MimeType=text/vnd.trolltech.linguist;application/x-linguist; Terminal=false +Encoding=UTF-8 Type=Application -Icon=linguist -Categories=Qt;Development;Translation +Categories=Qt;Development; diff --git a/abs/core/qt/qt.install b/abs/core/qt/qt.install index e70c054..81ce5c4 100644 --- a/abs/core/qt/qt.install +++ b/abs/core/qt/qt.install @@ -1,5 +1,6 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q } post_upgrade() { diff --git a/abs/core/qt/qtconfig.desktop b/abs/core/qt/qtconfig.desktop index 7c221e5..46dcf9e 100644 --- a/abs/core/qt/qtconfig.desktop +++ b/abs/core/qt/qtconfig.desktop @@ -4,5 +4,7 @@ Comment=Configure Qt behavior, styles, fonts Exec=/usr/bin/qtconfig Icon=qtlogo Terminal=false +Encoding=UTF-8 Type=Application Categories=Qt;Settings; +NoDisplay=true diff --git a/abs/core/run-parts/PKGBUILD b/abs/core/run-parts/PKGBUILD index a668496..73c3598 100644 --- a/abs/core/run-parts/PKGBUILD +++ b/abs/core/run-parts/PKGBUILD @@ -1,26 +1,24 @@ -# $Id: PKGBUILD 95110 2010-10-15 10:41:20Z pierre $ -# Maintainer: Pierre Schmitz <pierre@archlinux.de> +# $Id$ pkgname=run-parts -pkgver=3.4.1 +pkgver=4.0.2 pkgrel=1 pkgdesc='run scripts or programs in a directory' arch=('i686' 'x86_64') url='http://packages.qa.debian.org/d/debianutils.html' license=('GPL') depends=('glibc') -source=("http://ftp.debian.org/debian/pool/main/d/debianutils/debianutils_${pkgver}.tar.gz") -md5sums=('d488563ad7ea356d83f848becb1a3a4a') +source=("http://ftp.de.debian.org/debian/pool/main/d/debianutils/debianutils_${pkgver}.tar.gz") build() { - cd $srcdir/debianutils-$pkgver - ./configure --prefix=/usr - make run-parts || return 1 + cd $srcdir/debianutils-$pkgver + ./configure --prefix=/usr + make run-parts } package() { - cd $srcdir/debianutils-$pkgver - install -D -m755 run-parts $pkgdir/usr/bin/run-parts - install -D -m644 run-parts.8 $pkgdir/usr/share/man/man8/run-parts.8 + cd $srcdir/debianutils-$pkgver + install -D -m755 run-parts $pkgdir/usr/bin/run-parts + install -D -m644 run-parts.8 $pkgdir/usr/share/man/man8/run-parts.8 } - +md5sums=('bb96bc981174c97ad825816ed118d297') diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index f6cace4..828e54c 100755 --- a/abs/core/runit-scripts/PKGBUILD +++ b/abs/core/runit-scripts/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit-scripts pkgver=2.1.1 -pkgrel=22 +pkgrel=25 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license="BSD" diff --git a/abs/core/runit-scripts/runit-scripts-2.1.1-22.src.tar.gz b/abs/core/runit-scripts/runit-scripts-2.1.1-22.src.tar.gz deleted file mode 120000 index 9fba9d2..0000000 --- a/abs/core/runit-scripts/runit-scripts-2.1.1-22.src.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/packages/runit-scripts-2.1.1-22.src.tar.gz
\ No newline at end of file diff --git a/abs/core/runit-scripts/runitscripts/services/lighttpd/run b/abs/core/runit-scripts/runitscripts/services/lighttpd/run index 798690c..f9c574d 100755 --- a/abs/core/runit-scripts/runitscripts/services/lighttpd/run +++ b/abs/core/runit-scripts/runitscripts/services/lighttpd/run @@ -4,5 +4,10 @@ export TERM=linux . /etc/rc.d/functions stat_runit "Starting lighttpd" +if [ ! -d /var/run/lighttpd ] ; then + mkdir -p /var/run/lighttpd + chown http /var/run/lighttpd +fi -exec /usr/sbin/lighttpd -D -f /etc/lighttpd/lighttpd.conf +# Using -angel to start lighttpd allows lighttpd to accept signals +exec /usr/sbin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf diff --git a/abs/core/runit-scripts/runitscripts/services/mythexport/finish b/abs/core/runit-scripts/runitscripts/services/mythexport/finish new file mode 100755 index 0000000..b7fa7a6 --- /dev/null +++ b/abs/core/runit-scripts/runitscripts/services/mythexport/finish @@ -0,0 +1,4 @@ +#!/bin/bash + +# runit only knows about the run script wrapper, so kill the daemon ourselves + kill `pidof -o %PPID -x /usr/bin/mythexport-daemon` >/dev/null 2>&1 diff --git a/abs/core/runit-scripts/runitscripts/services/mythexport/run b/abs/core/runit-scripts/runitscripts/services/mythexport/run new file mode 100755 index 0000000..45f77fd --- /dev/null +++ b/abs/core/runit-scripts/runitscripts/services/mythexport/run @@ -0,0 +1,10 @@ +#!/bin/bash + +/sbin/chpst -u mythtv /usr/bin/mythexport-daemon + +PID=`pidof -o %PPID -x /usr/bin/mythexport-daemon` + +# Wait until daemon dies, else runit can't supervise us + while [ "`pidof -o %PPID -x /usr/bin/mythexport-daemon`" == "$PID" ]; do + sleep 2 + done diff --git a/abs/core/runit-scripts/runitscripts/services/smartd/run b/abs/core/runit-scripts/runitscripts/services/smartd/run index 15ed769..b8eafb6 100755 --- a/abs/core/runit-scripts/runitscripts/services/smartd/run +++ b/abs/core/runit-scripts/runitscripts/services/smartd/run @@ -3,11 +3,6 @@ . /etc/rc.conf . /etc/rc.d/functions - stat_runit "Starting smartd" - /usr/sbin/smartd -n -c /etc/smartd.conf -q never &>/dev/null - if [ $? -ne 0 ]; then - stat_fail - else - add_daemon smartd - stat_done - fi +stat_runit "Starting smartd" + + exec /usr/sbin/smartd -n -c /etc/smartd.conf -q never &>/dev/null diff --git a/abs/core/system-templates/system-templates-2.0-4.src.tar.gz b/abs/core/system-templates/system-templates-2.0-4.src.tar.gz deleted file mode 120000 index 111669c..0000000 --- a/abs/core/system-templates/system-templates-2.0-4.src.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/packages/system-templates-2.0-4.src.tar.gz
\ No newline at end of file diff --git a/abs/core/tar/PKGBUILD b/abs/core/tar/PKGBUILD index d4dd25b..3bde59b 100644 --- a/abs/core/tar/PKGBUILD +++ b/abs/core/tar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 98542 2010-11-11 03:48:12Z allan $ +# $Id$ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=tar -pkgver=1.25 +pkgver=1.26 pkgrel=1 pkgdesc="Utility used to store, backup, and transport files" arch=('i686' 'x86_64') @@ -13,16 +13,20 @@ groups=('base') depends=('glibc' 'sh') options=('!emptydirs') install=tar.install -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2 +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz tar.1) -md5sums=('6e497f861c77bbba2f7da4e10270995b' +md5sums=('0ced6f20b9fa1bea588005b5ad4b52c1' 'e0538778516a284e3558c454b2576c2f') build() { cd ${srcdir}/$pkgname-$pkgver - ./configure --prefix=/usr --libexecdir=/usr/lib/tar --bindir=/bin + FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix=/usr --libexecdir=/usr/lib/tar --bindir=/bin make +} + +check() { + cd ${srcdir}/$pkgname-$pkgver make check } diff --git a/abs/core/tar/__changelog b/abs/core/tar/__changelog new file mode 100644 index 0000000..4c86946 --- /dev/null +++ b/abs/core/tar/__changelog @@ -0,0 +1 @@ +added FORCE_UNSAFE_CONFIGURE=1 to configure line of PKGBUILD diff --git a/abs/core/tar/tar.install b/abs/core/tar/tar.install index 2f36c3c..8de1f97 100644 --- a/abs/core/tar/tar.install +++ b/abs/core/tar/tar.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(tar.info tar.info-1 tar.info-2) post_install() { diff --git a/abs/core/tzdata/PKGBUILD b/abs/core/tzdata/PKGBUILD index 93a6487..6046ec8 100644 --- a/abs/core/tzdata/PKGBUILD +++ b/abs/core/tzdata/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 130868 2011-07-08 14:35:26Z andyrtr $ +# $Id: PKGBUILD 98331 2010-11-07 18:34:04Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=tzdata -pkgver=2011h +pkgver=2010o pkgrel=1 -_tzcode=2011g -_tzdata=2011h +_tzcode=2010n +_tzdata=2010o pkgdesc="Sources for time zone and daylight saving time data" arch=('i686' 'x86_64') url="http://www.twinsun.com/tz/tz-link.htm" license=('GPL') depends=() makedepends=() -optdepends=('bash: required by tzselect') +optdepends=('sh: required by tzselect') options=('!emptydirs') source=(ftp://elsie.nci.nih.gov/pub/tzcode${_tzcode}.tar.gz \ ftp://elsie.nci.nih.gov/pub/${pkgname}${_tzdata}.tar.gz \ Makefile.patch) -md5sums=('ecb564279b28c5b184421c525d997d6c' - '546d27b6c1e5e1097bd512651815017f' +md5sums=('a7a776a5713831993e814fe0c05f9fd5' + '5cae5c56fad81dc29f8fcd933a05768e' 'a64ed97d1fc03c66ee8612c0d9f40507') build() { @@ -32,11 +32,6 @@ build() { make } -check() { - cd ${srcdir} - make check -} - package() { cd ${srcdir} make DESTDIR="${pkgdir}" install diff --git a/abs/core/util-linux-ng/PKGBUILD b/abs/core/util-linux-ng/PKGBUILD deleted file mode 100644 index 6653137..0000000 --- a/abs/core/util-linux-ng/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 86506 2010-08-02 14:22:19Z tpowa $ -# Maintainer: judd <jvinet@zeroflux.org> -pkgname=util-linux-ng -pkgver=2.18 -pkgrel=3 -pkgdesc="Miscellaneous system utilities for Linux" -url="http://userweb.kernel.org/~kzak/util-linux-ng/" -arch=('i686' 'x86_64') -groups=('base') -depends=('bash' 'ncurses>=5.7' 'zlib' 'filesystem') -replaces=('linux32' 'util-linux') -conflicts=('linux32' 'util-linux' 'e2fsprogs<1.41.8-2') -provides=('linux32' 'util-linux') -license=('GPL2') -options=('!libtool') -source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.18/${pkgname}-${pkgver}.tar.bz2 - fix-findmnt.patch - util-linux-ng-nilfs2.patch - util-linux-ng-cfdisk.patch) -optdepends=('perl: for chkdupexe support') -install=util-linux-ng.install -md5sums=('2f5f71e6af969d041d73ab778c141a77' - '7346673932b165faadde2fa2a9c1cd3a' - 'aa1f210aa22363605363b7b14b8f7a78' - 'e6d9309d44c258b25a7fb0b70f94f94e') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - # hardware clock - sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i hwclock/hwclock.c || return 1 - mkdir -p "${pkgdir}/var/lib/hwclock" || return 1 - # fix findmnt - patch -p1 -i "${srcdir}/fix-findmnt.patch" - # add nilfs2 support, included in next upstream release - patch -Np1 -i "${srcdir}/util-linux-ng-nilfs2.patch" - # fix cfdisk partition changing, included in next upstream release - patch -Np1 -i "${srcdir}/util-linux-ng-cfdisk.patch" - - autoreconf || return 1 - automake || return 1 - ./configure --enable-arch --enable-write --enable-raw --disable-wall --enable-rdev --enable-partx || return 1 - make HAVE_SLN=yes ADD_RAW=yes || return 1 - make HAVE_SLN=yes ADD_RAW=yes DESTDIR="${pkgdir}" install || return 1 - # remove files - rm -f "${pkgdir}/bin/kill" - rm -f "${pkgdir}/usr/share/man/man1/kill.1" - rm -f "${pkgdir}/usr/share/man/man5/nfs.5" - rm -f "${pkgdir}/usr/share/info/dir" -} diff --git a/abs/core/util-linux-ng/fix-findmnt.patch b/abs/core/util-linux-ng/fix-findmnt.patch deleted file mode 100644 index bf6574c..0000000 --- a/abs/core/util-linux-ng/fix-findmnt.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit a6c90fe597944f68fe49f45f1d8bc0d2e35104d4 -Author: Petr Uzel <petr.uzel-aRb0bU7PRFPrBKCeMvbIDA@public.gmane.org> -Date: Sun Jul 4 20:02:57 2010 +0200 - - libmount: fix merge_optstr (do not truncate 3 trailing characters) - - I believe this is the correct fix. - - Signed-off-by: Petr Uzel <petr.uzel-aRb0bU7PRFPrBKCeMvbIDA@public.gmane.org> - -diff --git a/shlibs/mount/src/tab_parse.c b/shlibs/mount/src/tab_parse.c -index 5dbcfa6..680e1fc 100644 ---- a/shlibs/mount/src/tab_parse.c -+++ b/shlibs/mount/src/tab_parse.c -@@ -254,7 +254,8 @@ static char *merge_optstr(const char *vfs, const char *fs) - if (!strcmp(vfs, fs)) - return strdup(vfs); /* e.g. "aaa" and "aaa" */ - -- sz = strlen(vfs) + strlen(fs) + 2; -+ /* leave space for leading "r[ow],", "," and trailing zero */ -+ sz = strlen(vfs) + strlen(fs) + 5; - res = malloc(sz); - if (!res) - return NULL; diff --git a/abs/core/util-linux-ng/util-linux-ng-cfdisk.patch b/abs/core/util-linux-ng/util-linux-ng-cfdisk.patch deleted file mode 100644 index bc60e43..0000000 --- a/abs/core/util-linux-ng/util-linux-ng-cfdisk.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 54a0fe298b4d6d948cffbd6fbbbe7dbabc9a6bb1 Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Mon, 19 Jul 2010 22:52:58 +0200 -Subject: [PATCH] cfdisk: get_string not calculating correct limits - -Reported-by: James L. Hammons <jlhamm@acm.org> -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - fdisk/cfdisk.c | 11 ++++++++--- - 1 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c -index 7fa0b19..e7955fe 100644 ---- a/fdisk/cfdisk.c -+++ b/fdisk/cfdisk.c -@@ -421,6 +421,11 @@ fdexit(int ret) { - exit(ret); - } - -+/* -+ * Note that @len is size of @str buffer. -+ * -+ * Returns number of read bytes (without \0). -+ */ - static int - get_string(char *str, int len, char *def) { - size_t cells = 0, i = 0; -@@ -472,7 +477,7 @@ get_string(char *str, int len, char *def) { - break; - default: - #if defined(HAVE_LIBNCURSESW) && defined(HAVE_WIDECHAR) -- if (i < len && iswprint(c)) { -+ if (i + 1 < len && iswprint(c)) { - wchar_t wc = (wchar_t) c; - char s[MB_CUR_MAX + 1]; - int sz = wctomb(s, wc); -@@ -492,7 +497,7 @@ get_string(char *str, int len, char *def) { - putchar(BELL); - } - #else -- if (i < len && isprint(c)) { -+ if (i + 1 < len && isprint(c)) { - mvaddch(y, x + cells, c); - if (use_def) { - clrtoeol(); -@@ -2405,7 +2410,7 @@ change_id(int i) { - - sprintf(def, "%02X", new_id); - mvaddstr(COMMAND_LINE_Y, COMMAND_LINE_X, _("Enter filesystem type: ")); -- if ((len = get_string(id, 2, def)) <= 0 && len != GS_DEFAULT) -+ if ((len = get_string(id, 3, def)) <= 0 && len != GS_DEFAULT) - return; - - if (len != GS_DEFAULT) { --- -1.7.2.1 - diff --git a/abs/core/util-linux-ng/util-linux-ng-nilfs2.patch b/abs/core/util-linux-ng/util-linux-ng-nilfs2.patch deleted file mode 100644 index 3ac215b..0000000 --- a/abs/core/util-linux-ng/util-linux-ng-nilfs2.patch +++ /dev/null @@ -1,276 +0,0 @@ -From b44b8600d4096de8203c1fb0702bbc95ee51017f Mon Sep 17 00:00:00 2001 -From: Jiro SEKIBA <jir@unicus.jp> -Date: Tue, 13 Jul 2010 09:12:56 +0200 -Subject: [PATCH] libblkid: add nilfs2 filesystem superblock probe - -This patch implements nilfs2_idinfo to proble nilfs2 partition. -The patch probes uuid, label, version and verify crc check sum of -superblock. - -Signed-off-by: Jiro SEKIBA <jir@unicus.jp> -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - shlibs/blkid/src/superblocks/Makefile.am | 1 + - shlibs/blkid/src/superblocks/nilfs.c | 120 ++++++++++++++++++++++++++++ - shlibs/blkid/src/superblocks/superblocks.c | 1 + - shlibs/blkid/src/superblocks/superblocks.h | 1 + - 4 files changed, 123 insertions(+), 0 deletions(-) - create mode 100644 shlibs/blkid/src/superblocks/nilfs.c - -diff --git a/shlibs/blkid/src/superblocks/Makefile.am b/shlibs/blkid/src/superblocks/Makefile.am -index 39b074b..1501fab 100644 ---- a/shlibs/blkid/src/superblocks/Makefile.am -+++ b/shlibs/blkid/src/superblocks/Makefile.am -@@ -47,4 +47,5 @@ libblkid_superblocks_la_SOURCES = \ - drbd.c \ - vmfs.c \ - befs.c \ -+ nilfs.c \ - exfat.c -diff --git a/shlibs/blkid/src/superblocks/nilfs.c b/shlibs/blkid/src/superblocks/nilfs.c -new file mode 100644 -index 0000000..c7aba35 ---- /dev/null -+++ b/shlibs/blkid/src/superblocks/nilfs.c -@@ -0,0 +1,120 @@ -+/* -+ * Copyright (C) 2010 by Jiro SEKIBA <jir@unicus.jp> -+ * -+ * This file may be redistributed under the terms of the -+ * GNU Lesser General Public License -+ */ -+#include <stddef.h> -+#include <string.h> -+ -+#include "superblocks.h" -+#include "crc32.h" -+ -+struct nilfs_super_block { -+ uint32_t s_rev_level; -+ uint16_t s_minor_rev_level; -+ uint16_t s_magic; -+ -+ uint16_t s_bytes; -+ -+ uint16_t s_flags; -+ uint32_t s_crc_seed; -+ uint32_t s_sum; -+ -+ uint32_t s_log_block_size; -+ -+ uint64_t s_nsegments; -+ uint64_t s_dev_size; -+ uint64_t s_first_data_block; -+ uint32_t s_blocks_per_segment; -+ uint32_t s_r_segments_percentage; -+ -+ uint64_t s_last_cno; -+ uint64_t s_last_pseg; -+ uint64_t s_last_seq; -+ uint64_t s_free_blocks_count; -+ -+ uint64_t s_ctime; -+ -+ uint64_t s_mtime; -+ uint64_t s_wtime; -+ uint16_t s_mnt_count; -+ uint16_t s_max_mnt_count; -+ uint16_t s_state; -+ uint16_t s_errors; -+ uint64_t s_lastcheck; -+ -+ uint32_t s_checkinterval; -+ uint32_t s_creator_os; -+ uint16_t s_def_resuid; -+ uint16_t s_def_resgid; -+ uint32_t s_first_ino; -+ -+ uint16_t s_inode_size; -+ uint16_t s_dat_entry_size; -+ uint16_t s_checkpoint_size; -+ uint16_t s_segment_usage_size; -+ -+ uint8_t s_uuid[16]; -+ char s_volume_name[80]; -+ -+ uint32_t s_c_interval; -+ uint32_t s_c_block_max; -+ uint32_t s_reserved[192]; -+}; -+ -+/* nilfs2 magic string */ -+#define NILFS_SB_MAGIC "\x34\x34" -+/* nilfs2 super block offset */ -+#define NILFS_SB_OFF 0x400 -+/* nilfs2 super block offset in kB */ -+#define NILFS_SB_KBOFF (NILFS_SB_OFF >> 10) -+/* nilfs2 magic string offset within super block */ -+#define NILFS_MAG_OFF 6 -+ -+static int probe_nilfs2(blkid_probe pr, const struct blkid_idmag *mag) -+{ -+ struct nilfs_super_block *sb; -+ static unsigned char sum[4]; -+ const int sumoff = offsetof(struct nilfs_super_block, s_sum); -+ size_t bytes; -+ uint32_t crc; -+ -+ sb = blkid_probe_get_sb(pr, mag, struct nilfs_super_block); -+ if (!sb) -+ return -1; -+ -+ bytes = le32_to_cpu(sb->s_bytes); -+ crc = crc32(le32_to_cpu(sb->s_crc_seed), (unsigned char *)sb, sumoff); -+ crc = crc32(crc, sum, 4); -+ crc = crc32(crc, (unsigned char *)sb + sumoff + 4, bytes - sumoff - 4); -+ -+ if (crc != le32_to_cpu(sb->s_sum)) -+ return -1; -+ -+ if (strlen(sb->s_volume_name)) -+ blkid_probe_set_label(pr, (unsigned char *) sb->s_volume_name, -+ sizeof(sb->s_volume_name)); -+ -+ blkid_probe_set_uuid(pr, sb->s_uuid); -+ blkid_probe_sprintf_version(pr, "%u", le32_to_cpu(sb->s_rev_level)); -+ -+ return 0; -+} -+ -+const struct blkid_idinfo nilfs2_idinfo = -+{ -+ .name = "nilfs", -+ .usage = BLKID_USAGE_FILESYSTEM, -+ .probefunc = probe_nilfs2, -+ .magics = -+ { -+ { -+ .magic = NILFS_SB_MAGIC, -+ .len = 2, -+ .kboff = NILFS_SB_KBOFF, -+ .sboff = NILFS_MAG_OFF -+ }, -+ { NULL } -+ } -+}; -diff --git a/shlibs/blkid/src/superblocks/superblocks.c b/shlibs/blkid/src/superblocks/superblocks.c -index b80c10b..3d66d98 100644 ---- a/shlibs/blkid/src/superblocks/superblocks.c -+++ b/shlibs/blkid/src/superblocks/superblocks.c -@@ -140,6 +140,7 @@ static const struct blkid_idinfo *idinfos[] = - &bfs_idinfo, - &vmfs_fs_idinfo, - &befs_idinfo, -+ &nilfs2_idinfo, - &exfat_idinfo - }; - -diff --git a/shlibs/blkid/src/superblocks/superblocks.h b/shlibs/blkid/src/superblocks/superblocks.h -index 74cb974..a79d7cb 100644 ---- a/shlibs/blkid/src/superblocks/superblocks.h -+++ b/shlibs/blkid/src/superblocks/superblocks.h -@@ -65,6 +65,7 @@ extern const struct blkid_idinfo vmfs_volume_idinfo; - extern const struct blkid_idinfo vmfs_fs_idinfo; - extern const struct blkid_idinfo drbd_idinfo; - extern const struct blkid_idinfo befs_idinfo; -+extern const struct blkid_idinfo nilfs2_idinfo; - extern const struct blkid_idinfo exfat_idinfo; - - /* --- -1.7.2.1 -From 67bb0074eec2b154d15bd3dd77b482c3d6125761 Mon Sep 17 00:00:00 2001 -From: Jiro SEKIBA <jir@unicus.jp> -Date: Tue, 13 Jul 2010 09:14:08 +0200 -Subject: [PATCH] tests: add nilfs2 test for libblkid - -Signed-off-by: Jiro SEKIBA <jir@unicus.jp> -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - tests/expected/blkid/low-probe-nilfs2 | 7 +++++++ - tests/ts/blkid/images-fs/nilfs2.img.bz2 | Bin 0 -> 795 bytes - 2 files changed, 7 insertions(+), 0 deletions(-) - create mode 100644 tests/expected/blkid/low-probe-nilfs2 - create mode 100644 tests/ts/blkid/images-fs/nilfs2.img.bz2 - -diff --git a/tests/expected/blkid/low-probe-nilfs2 b/tests/expected/blkid/low-probe-nilfs2 -new file mode 100644 -index 0000000..bfd8fcd ---- /dev/null -+++ b/tests/expected/blkid/low-probe-nilfs2 -@@ -0,0 +1,7 @@ -+ID_FS_LABEL=test-nilfs2 -+ID_FS_LABEL_ENC=test-nilfs2 -+ID_FS_TYPE=nilfs -+ID_FS_USAGE=filesystem -+ID_FS_UUID=524025fb-6d31-40e6-baad-1db36cfdf806 -+ID_FS_UUID_ENC=524025fb-6d31-40e6-baad-1db36cfdf806 -+ID_FS_VERSION=2 -diff --git a/tests/ts/blkid/images-fs/nilfs2.img.bz2 b/tests/ts/blkid/images-fs/nilfs2.img.bz2 -new file mode 100644 -index 0000000000000000000000000000000000000000..a9762eb1ace9f1999aaad3c40f1d836668d856ac -GIT binary patch -literal 795 -zcmZ>Y%CIzaj8qGbG`Ml9n}H$iKM?$BcJi+ANKl`nz?|O0@_@lbK*y;^z=e@R;iM8v -z^#R6D2YV7HdVE!LUvc5DPv^n~3?@drY>Er`xpEzs%?rp}D3rOt`HEDABm)D32?GP; -z0!EREipv^IOn^)V240{j^Q<Hzqs++;Mp8zSMhpyWZZoCW1WqjeK1)#Iz#6seeHv~( -zmxJ_T@69=2^IA3QjKnD|>vorkjN+>MH*4-%s37X<)*F#v)Rf{P;KEe-N=h(9AxK5r -zNaB>=<>ixS2R?swwRU~FskVY@0E2@ILyiK&T}MB??Mn}*D~htZ3cdTZRH0!*OIOhp -zuF1Yi0SZB_TmsB4k61&aUN!_Ugm_J068*5`gF*w#0teARmnpo_kuT2~GOf!|DtB62 -z!)T++5$eFKB*GXf;<I9F!NQM?v;8`}*7b6px{&k4S4E)bP}5GYFDbo;*GrVLFkN9@ -z@@Z9sSb~JGco?eycMA(Q^Ph&Ju|ft>1p%^G=UuLqkPtM9ycck)X|u7g*QFMo>QK!; -zURQKH*iWxuZsIwzh@rOT!@1{s7L*D22$pQI7i2k@S1M-~SA2Zm@7XFsJ@fXR;7eg< -zQ4&<W_Vc7f@7p(fvkiM$nYo*^O$-78_-wK~RVMkbV1D8JQ`OC<q49;V$o`^l=O3L4 -zcH6Z3#E!YsGG`s)RMF~EOO1d3>aY{zarw_8qLWfhCp?&^`$6=_69yh&WHm7`bFf@V -z(PE04u!6IgDET?h6*ny4n=k(V{?{W7DhkUTSQr9X7>p_oxG=CVFtI2!vN$jZD6(v3 -z;O=l+m1w{)gHeLB;X+0N+bk2QBw&h}z@#bCHj{nH7h4xLj+2u!PE3DPVsFhCSH8Sp -zT}DV?fa{Ns2bOWHVhs!t%xc}wps|W$-`>x&rn$fKjBA>})U}{HMs?HV9M&t-a)KVS -zYg}FWIQh_-FYD!hutchUy`86XxmogM<nBjObNPCsG{5_M%3n}$Xkh3NkUdt<dS{}a -Lh>ElVLy7|cD)2Ck - -literal 0 -HcmV?d00001 - --- -1.7.2.1 -From 1326e1dfa5c1d06ff7521b8c8162452799164239 Mon Sep 17 00:00:00 2001 -From: Jiro SEKIBA <jir@unicus.jp> -Date: Thu, 15 Jul 2010 13:40:27 +0900 -Subject: [PATCH] libblkid: fix typo filesystem name nilfs to nilfs2 - -The correct filesystem name is nilfs2, not nilfs. - -Signed-off-by: Jiro SEKIBA <jir@unicus.jp> ---- - shlibs/blkid/src/superblocks/nilfs.c | 2 +- - tests/expected/blkid/low-probe-nilfs2 | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/shlibs/blkid/src/superblocks/nilfs.c b/shlibs/blkid/src/superblocks/nilfs.c -index c7aba35..bf16918 100644 ---- a/shlibs/blkid/src/superblocks/nilfs.c -+++ b/shlibs/blkid/src/superblocks/nilfs.c -@@ -104,7 +104,7 @@ static int probe_nilfs2(blkid_probe pr, const struct blkid_idmag *mag) - - const struct blkid_idinfo nilfs2_idinfo = - { -- .name = "nilfs", -+ .name = "nilfs2", - .usage = BLKID_USAGE_FILESYSTEM, - .probefunc = probe_nilfs2, - .magics = -diff --git a/tests/expected/blkid/low-probe-nilfs2 b/tests/expected/blkid/low-probe-nilfs2 -index bfd8fcd..c6c9cab 100644 ---- a/tests/expected/blkid/low-probe-nilfs2 -+++ b/tests/expected/blkid/low-probe-nilfs2 -@@ -1,6 +1,6 @@ - ID_FS_LABEL=test-nilfs2 - ID_FS_LABEL_ENC=test-nilfs2 --ID_FS_TYPE=nilfs -+ID_FS_TYPE=nilfs2 - ID_FS_USAGE=filesystem - ID_FS_UUID=524025fb-6d31-40e6-baad-1db36cfdf806 - ID_FS_UUID_ENC=524025fb-6d31-40e6-baad-1db36cfdf806 --- -1.7.2.1 - diff --git a/abs/core/util-linux-ng/util-linux-ng.install b/abs/core/util-linux-ng/util-linux-ng.install deleted file mode 100644 index b057db9..0000000 --- a/abs/core/util-linux-ng/util-linux-ng.install +++ /dev/null @@ -1,21 +0,0 @@ -infodir=/usr/share/info -filelist=(ipc.info.gz) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - usr/bin/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 - usr/bin/install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} - diff --git a/abs/core/x264/PKGBUILD b/abs/core/x264/PKGBUILD index 169184a..c482e04 100644 --- a/abs/core/x264/PKGBUILD +++ b/abs/core/x264/PKGBUILD @@ -3,16 +3,16 @@ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=x264 -pkgver=20101116 +pkgver=20110803 pkgrel=1 pkgdesc="free library for encoding H264/AVC video streams" arch=('i686' 'x86_64') url="http://www.videolan.org/developers/x264.html" license=('GPL') depends=('glibc') -makedepends=('yasm') +optdepends=('gpac: For gpac support') +makedepends=('yasm' 'gpac') source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${pkgver}-2245.tar.bz2) -md5sums=('18a03ff761a290e84cb9f75e716fa5dc') build() { cd "${srcdir}/${pkgname}-snapshot-${pkgver}-2245" || return 1 @@ -34,3 +34,4 @@ package() { } # vim:set ts=2 sw=2 et: +md5sums=('6148c89b85b1136e8047882037a57c07') diff --git a/abs/core/xf86-input-evdev/PKGBUILD b/abs/core/xf86-input-evdev/PKGBUILD index 55c7faa..c6776bd 100644 --- a/abs/core/xf86-input-evdev/PKGBUILD +++ b/abs/core/xf86-input-evdev/PKGBUILD @@ -1,27 +1,31 @@ -# $Id: PKGBUILD 88543 2010-08-24 08:25:22Z jgc $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <Alexander@archlinux.org pkgname=xf86-input-evdev pkgver=2.6.0 -pkgrel=1 +pkgrel=4 pkgdesc="X.org evdev input driver" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') makedepends=('xorg-server-devel') conflicts=('xorg-server<1.9.0') -options=('!libtool' !makeflags) -groups=('xorg-input-drivers') +options=('!libtool' '!makeflags') +groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('fb6f7a6f5168ae07efe890e4ace9fb8af1d4e1e0') 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}/" } -md5sums=('f33fe9413bde68936d8909206a13e8a1') diff --git a/abs/core/xf86-input-evdev/initialize-valuators.patch b/abs/core/xf86-input-evdev/initialize-valuators.patch deleted file mode 100644 index 47b02db..0000000 --- a/abs/core/xf86-input-evdev/initialize-valuators.patch +++ /dev/null @@ -1,61 +0,0 @@ -From ed47c7f33e315f163a6aebeb3e1c8947004576fd Mon Sep 17 00:00:00 2001 -From: Bartosz Brachaczek <b.brachaczek@gmail.com> -Date: Tue, 10 Aug 2010 20:31:00 +0000 -Subject: evdev: Revert "Set all valuators for relative motion events (#24737)" - -It isn't necessary to post zero-deltas to X Server. In order not to post -uninitialized "v" array we should rather simply initialize it. - -This reverts commit c1f16a4f59a584ab4546c2f16e20b06703042057. - -Signed-off-by: Bartosz Brachaczek <b.brachaczek@gmail.com> -Tested-by: Bartek Iwaniec <hash87@gmail.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- -diff --git a/src/evdev.c b/src/evdev.c -index 5ea230c..bdac330 100644 ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -386,7 +386,7 @@ EvdevProcessValuators(InputInfoPtr pInfo, int v[MAX_VALUATORS], int *num_v, - for (i = 0; i < REL_CNT; i++) - { - int map = pEvdev->axis_map[i]; -- if (map != -1) -+ if (pEvdev->delta[i] && map != -1) - { - v[map] = pEvdev->delta[i]; - if (map < first) --- -cgit v0.8.3-6-g21f6 -From ec6cb31cc47eed3ccba4c906ca6c54b99136e9eb Mon Sep 17 00:00:00 2001 -From: Bartosz Brachaczek <b.brachaczek@gmail.com> -Date: Tue, 10 Aug 2010 20:31:37 +0000 -Subject: evdev: Initialize valuators array. (#24737) - -The array needs to be filled with zeros, otherwise we may end up sending -it with random values if non-zero values aren't in one row (which is the -case for A4Tech X-750F which sends REL_MISC events without a reason). - -X.Org Bug 24737 <http://bugs.freedesktop.org/show_bug.cgi?id=24737> - -Signed-off-by: Bartosz Brachaczek <b.brachaczek@gmail.com> -Tested-by: Bartek Iwaniec <hash87@gmail.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- -diff --git a/src/evdev.c b/src/evdev.c -index bdac330..512e957 100644 ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -661,7 +661,7 @@ static void - EvdevProcessSyncEvent(InputInfoPtr pInfo, struct input_event *ev) - { - int num_v = 0, first_v = 0; -- int v[MAX_VALUATORS]; -+ int v[MAX_VALUATORS] = {}; - EvdevPtr pEvdev = pInfo->private; - - EvdevProcessValuators(pInfo, v, &num_v, &first_v); --- -cgit v0.8.3-6-g21f6 diff --git a/abs/core/xf86-video-intel/xf86-video-intel-2.15.0-3.src.tar.gz b/abs/core/xf86-video-intel/xf86-video-intel-2.15.0-3.src.tar.gz deleted file mode 120000 index ab7d945..0000000 --- a/abs/core/xf86-video-intel/xf86-video-intel-2.15.0-3.src.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/packages/xf86-video-intel-2.15.0-3.src.tar.gz
\ No newline at end of file diff --git a/abs/core/xfsprogs/PKGBUILD b/abs/core/xfsprogs/PKGBUILD index 0c2af21..8d2e53b 100644 --- a/abs/core/xfsprogs/PKGBUILD +++ b/abs/core/xfsprogs/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 90211 2010-09-09 07:35:10Z tpowa $ +# $Id$ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=xfsprogs -pkgver=3.1.4 +pkgver=3.1.5 pkgrel=1 pkgdesc="XFS filesystem utilities" arch=('i686' 'x86_64') @@ -10,16 +10,20 @@ url="http://oss.sgi.com/projects/xfs/" groups=('base') depends=('util-linux-ng>=2.16') options=('!makeflags' '!libtool') -source=(ftp://oss.sgi.com/projects/xfs/cmd_tars/${pkgname}-${pkgver}.tar.gz) +# We mirror the sources as upstream tends to move them once a new release is out +source=("ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz") +md5sums=('b1db37749e2b4149a0dd178abff956be') build() { cd "${srcdir}/${pkgname}-${pkgver}" export OPTIMIZER="-march=${CARCH/_/-} -O1" export DEBUG=-DNDEBUG - make || return 1 + make } + package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DIST_ROOT="${pkgdir}" install install-dev || return 1 + make DIST_ROOT="${pkgdir}" install install-dev + chown -R root $pkgdir + chgrp -R root $pkgdir } -md5sums=('74081975f148bcabcab26c4c3496ede9') |