diff options
37 files changed, 979 insertions, 155 deletions
diff --git a/coherence/kdepim-runtime-coherence/PKGBUILD b/coherence/kdepim-runtime-coherence/PKGBUILD new file mode 100644 index 000000000..7fa4c0a00 --- /dev/null +++ b/coherence/kdepim-runtime-coherence/PKGBUILD @@ -0,0 +1,36 @@ +# $Id$ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> +# Maintainer (Parabola): André Silva <emulatorman@parabola.nu> + +_pkgname=kdepim-runtime +pkgname=kdepim-runtime-coherence +pkgver=4.10.5 +pkgrel=1 +pkgdesc='Extends the functionality of kdepim, without libkgapi support' +arch=('i686' 'x86_64') +url='https://projects.kde.org/projects/kde/kdepim-runtime' +license=('GPL' 'LGPL' 'FDL') +depends=('kdebase-runtime' 'libkolab') +makedepends=('cmake' 'automoc4' 'boost') +install="${_pkgname}.install" +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz") +sha1sums=('f0b18cd320973c02d9b52cce9f4f424cb868d7fb') + +build() { + mkdir build + cd build + cmake ../${_pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DKDE4_BUILD_TESTS=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd build + make DESTDIR="${pkgdir}" install +} diff --git a/coherence/kdepim-runtime-coherence/kdepim-runtime.install b/coherence/kdepim-runtime-coherence/kdepim-runtime.install new file mode 100644 index 000000000..c77e68041 --- /dev/null +++ b/coherence/kdepim-runtime-coherence/kdepim-runtime.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/coherence/your-coherence/PKGBUILD b/coherence/your-coherence/PKGBUILD new file mode 100644 index 000000000..c5bfbe5d7 --- /dev/null +++ b/coherence/your-coherence/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Parabola Project <dev@list.parabolagnulinux.org> +pkgname=your-coherence +pkgver=$(LC_ALL=C date -u +%Y%m%d) +pkgrel=1 +pkgdesc="This package will remove support for unsafe/dangerous for privacy protocols/services." +arch=('any') +url="https://parabolagnulinux.org" +license=('GPL3') +install=${pkgname}.install +source=(${pkgname}-blacklist-${pkgver}.txt::https://projects.parabolagnulinux.org/blacklist.git/plain/${pkgname}-blacklist.txt) + +package() { + conflicts=($(cut -d: -f1,2 ${pkgname}-blacklist-${pkgver}.txt | \ + sed "s/:$//" | \ + grep -v ":" | \ + grep -v '^#' | \ + sort -u + )) + cd ${srcdir} + install -d ${pkgdir}/usr/share/doc/${pkgname} + install -m644 ${pkgname}-blacklist-${pkgver}.txt ${pkgdir}/usr/share/doc/${pkgname}/ +} + +md5sums=('5fd14982619414fea1882b351607291e') diff --git a/coherence/your-coherence/your-coherence.install b/coherence/your-coherence/your-coherence.install new file mode 100644 index 000000000..d5ece49d4 --- /dev/null +++ b/coherence/your-coherence/your-coherence.install @@ -0,0 +1,30 @@ + +pre_install() { + cat <<EOM + == IMPORTANT NOTICE == + + This package will help you identify if packages that support + unsafe/dangerous for privacy protocols/services are installed on your + system at the time of its installation, as well as protecting you from + (accidentally) installing them. + + Also, if any other package that support unsafe/dangerous for privacy + protocols/services is identified, later updates will ask you for its + removal. + + Have in mind that, if you want to retain certain packages that support + unsafe/dangerous for privacy protocols/services installed on your system, + you'll have to remove your-coherence :) + + Please report any issue to the Coherence Team on the usual channels: + * https://labs.parabola.nu + * irc://freenode.net/#your-coherence + * mailto:dev@lists.parabolagnulinux.org +EOM +} + +pre_upgrade() { + pre_install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/augeas/PKGBUILD b/community/augeas/PKGBUILD index 9c79d790e..fc5c9f020 100644 --- a/community/augeas/PKGBUILD +++ b/community/augeas/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 83877 2013-02-06 10:39:22Z spupykin $ +# $Id: PKGBUILD 95728 2013-08-16 08:25:38Z spupykin $ # Contributor: Thomas S Hatch <thatch45@gmail.com> # Contributor: Jon Nordby <jononor@gmail.com> pkgname=augeas -pkgver=1.0.0 +pkgver=1.1.0 pkgrel=1 pkgdesc="A configuration editing tool that parses config files and transforms them into a tree" arch=('i686' 'x86_64') @@ -11,9 +11,9 @@ url="http://augeas.net" license=('LGPL') depends=('libxml2' 'gcc-libs') options=('!libtool') -source=(http://augeas.net/download/$pkgname-$pkgver.tar.gz{,.sig}) -md5sums=('82131019432ecf8102e1491610ad2dd1' - '63b2f334b030c957c98ee01ef207cfdd') +source=(http://download.augeas.net/augeas-$pkgver.tar.gz{,.sig}) +md5sums=('520ce983457ff9ffa3816bc41a9f328b' + 'SKIP') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/echoping/PKGBUILD b/community/echoping/PKGBUILD new file mode 100644 index 000000000..8aa171a71 --- /dev/null +++ b/community/echoping/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Florian Pritz <bluewind@xinu.at> + +pkgname=echoping +pkgver=6.0.2 +pkgrel=3 +pkgdesc="tests performance of a remote host by sending HTTP, TCP and UDP requests" +arch=('i686' 'x86_64') +url="http://echoping.sourceforge.net/" +license=('GPL') +depends=(libidn popt libldap) +source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) +md5sums=('991478532b56ab3b6f46ea9fa332626f') +options=(!libtool) + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --config-cache + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + + make DESTDIR=$pkgdir install +} diff --git a/community/gigi/PKGBUILD b/community/gigi/PKGBUILD index 95f839ee9..63772c53e 100644 --- a/community/gigi/PKGBUILD +++ b/community/gigi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94022 2013-07-13 12:32:08Z svenstaro $ +# $Id: PKGBUILD 95773 2013-08-16 17:52:10Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: fana-m <geminin@gmx.net> @@ -7,16 +7,16 @@ pkgname=gigi pkgver=6142 -pkgrel=1 +pkgrel=2 pkgdesc='Small, efficient and feature rich GUI for OpenGL and C++ (freeorion fork)' #url='http://gigi.sourceforge.net/' url='http://freeorion.svn.sourceforge.net/viewvc/freeorion/trunk/FreeOrion/GG/' arch=('x86_64' 'i686') license=('LGPL') depends=('boost' 'libpng' 'libtiff' 'ogre' 'sdl' 'python') -makedepends=('subversion' 'cmake' 'setconf' 'doxygen' 'mesa-libgl') +makedepends=('subversion' 'cmake' 'setconf' 'doxygen' 'addinclude' 'mesa-libgl') #https://gigi.svn.sourceforge.net/svnroot/gigi/trunk/GG/ -source=("$pkgname::svn+https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/GG/#revision=6142") # 5780 # 5407 +source=("$pkgname::svn+https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/GG/") sha256sums=('SKIP') pkgver() { @@ -25,56 +25,37 @@ pkgver() { svnversion | tr -d [A-z] } -build() { - cd "$srcdir/$pkgname" +prepare() { + cd "$pkgname" - msg2 'Configuring...' setconf cmake/GiGiOgre.pc.in prefix /usr setconf cmake/GiGi.pc.in prefix /usr setconf cmake/GiGiSDL.pc.in prefix /usr - # It would be better if CMAKE_INSTALL_PREFIX or the resulting Makefiles - # could be re-configured in the package() function, but this works too. + addinclude -n GG/adobe/once.hpp '#include <stdint.h>' +} + +build() { + cd "$pkgname" + cmake \ -D CMAKE_INSTALL_PREFIX="$srcdir/pkg/usr" \ -D BUILD_TUTORIALS=OFF \ -D CPACK_GENERATOR=GiGiDevel \ -D CMAKE_C_FLAGS_RELEASE='-DNDEBUG' \ . - - #msg2 'Building documentation...' - #cd doc - #doxygen - #cd .. - - msg2 'Compiling...' make -j1 } package() { - cd "$srcdir/$pkgname" + cd "$pkgname" - msg2 'Packaging files...' make install - - msg2 'Moving files to the right location...' mv -v "$srcdir/pkg/usr" "$pkgdir/" - #msg2 'Fixing documentation...' - #mkdir -p "$pkgdir/usr/share/doc" - #mv "$pkgdir/usr/doc" "$pkgdir/usr/share/doc/$pkgname" - - #for f in `find "$pkgdir/usr/share/doc" -name "dir_*.html"`; do - # sed -i "s:$srcdir:/:g" "$f" - #done - - msg2 'Python 3 fix...' + # python3 fix for f in `find "$pkgdir/usr" -name "*.py"`; do sed -i "s:/env python:/python3:g" "$f" done - - msg2 'Packaging license...' - install -Dm644 COPYING \ - "$pkgdir/usr/share/licenses/$pkgname/COPYING" } # vim:set ts=2 sw=2 et: diff --git a/community/jshon/PKGBUILD b/community/jshon/PKGBUILD index d04a76d85..6ef9efa50 100644 --- a/community/jshon/PKGBUILD +++ b/community/jshon/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 80521 2012-11-23 18:22:00Z kkeen $ +# $Id: PKGBUILD 95722 2013-08-16 00:46:12Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> pkgname=jshon -pkgver=20121122 +pkgver=20130815 pkgrel=1 pkgdesc="A json parser for the shell." arch=('i686' 'x86_64') @@ -9,7 +9,7 @@ url="http://kmkeen.com/jshon/" license=('MIT') depends=('jansson') source=(http://kmkeen.com/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('b66f6b23b510fc2cb571dcb69121b24c') +md5sums=('3ef31b1954ef0838f67bcaf20993dcdd') build() { cd "$srcdir/$pkgname-$pkgver" @@ -18,6 +18,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - install -Dm755 $pkgname "$pkgdir/usr/bin/$pkgname" + install -Dm755 $pkgname "$pkgdir/usr/bin/$pkgname" install -Dm644 $pkgname.1 "$pkgdir/usr/share/man/man1/$pkgname.1" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/lilyterm/PKGBUILD b/community/lilyterm/PKGBUILD index 1c44b642d..74ab19fa5 100644 --- a/community/lilyterm/PKGBUILD +++ b/community/lilyterm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80564 2012-11-25 16:09:33Z kkeen $ +# $Id: PKGBUILD 95718 2013-08-15 23:23:35Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: TDY <tdy@gmx.com> # Contributor: DonVla <donvla@users.sourceforge.net> @@ -6,7 +6,7 @@ pkgname=lilyterm pkgver=0.9.9.2 -pkgrel=1 +pkgrel=2 pkgdesc="A light and easy to use libvte based X terminal emulator" arch=('i686' 'x86_64') url="http://lilyterm.luna.com.tw/index_en.html" @@ -27,7 +27,5 @@ build() { package() { cd "$srcdir/lilyterm-$pkgver" make DESTDIR="$pkgdir" install - install -Dm644 COPYING \ - "$pkgdir/usr/share/licenses/lilyterm/COPYING" } diff --git a/community/midori-gtk3/PKGBUILD b/community/midori-gtk3/PKGBUILD index 8f2deb460..58ec03246 100644 --- a/community/midori-gtk3/PKGBUILD +++ b/community/midori-gtk3/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 94988 2013-08-02 13:05:49Z arodseth $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# $Id: PKGBUILD 95787 2013-08-16 19:42:18Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: rabyte <rabyte.at.gmail.dot.com> # Contributor: Johannes Krampf <wuischke.at.amule.dot.org> # Contributor: Bartłomiej Piotrowski <barthalion@gmail.com> pkgname=midori-gtk3 -pkgver=0.5.4 -pkgrel=2 +pkgver=0.5.5 +pkgrel=1 pkgdesc='Lightweight web browser (GTK3)' arch=('x86_64' 'i686') url='http://www.midori-browser.org/' @@ -17,29 +17,29 @@ install='midori.install' conflicts=('midori') provides=('midori') depends=('libzeitgeist' 'webkitgtk' 'libnotify' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'libunique3' 'gcr') -makedepends=('pkg-config' 'bzr' 'python2' 'libxml2' 'gtk3' 'intltool' 'python2-docutils' 'libsoup' 'vala' 'librsvg') -optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support' +makedepends=('bzr' 'python2' 'intltool' 'vala' 'librsvg') +optdepends=('gst-plugins-base: HTML5 OGG videos support' + 'gst-plugins-good: HTML5 H264 and WebM videos support' + 'gst-libav: HTML5 H264 videos support' 'aria2: download utility') options=('!emptydirs') -source=("http://www.midori-browser.org/downloads/midori_${pkgver}_all_.tar.bz2") -sha256sums=('d4ee77f3dd9bf2c07cea7674d533e77960e9346bd8b5482582ccb3cdaf182022') +source=("http://www.midori-browser.org/downloads/${pkgname/-gtk3}_${pkgver}_all_.tar.bz2") +sha256sums=('ca69382a285222a86028abebd73fed1976735883027ff0adc094b627789bbd62') build() { - cd "$srcdir/midori_${pkgver}_all_" + cd "$srcdir/${pkgname/-gtk3}-${pkgver}" - # if granite is present, the build fails (last time I tried) - python2 ./waf configure \ + ./configure \ --prefix=/usr \ --enable-gtk3 \ - --disable-granite \ - --enable-webkit2 - python2 ./waf build + --disable-granite + make } package() { - cd "$srcdir/midori_${pkgver}_all_" + cd "$srcdir/${pkgname/-gtk3}-${pkgver}" - DESTDIR="$pkgdir" python2 ./waf install + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/community/mksh/PKGBUILD b/community/mksh/PKGBUILD index c2741f62f..c15073565 100644 --- a/community/mksh/PKGBUILD +++ b/community/mksh/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 94436 2013-07-25 05:59:37Z ttoepper $ +# $Id: PKGBUILD 95786 2013-08-16 19:38:52Z ttoepper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Daniel Hommel <dhommel@gmail.com> pkgname=mksh -pkgver=R47 +pkgver=R48 pkgrel=1 pkgdesc='The MirBSD Korn Shell - an enhanced version of the public domain ksh' url='https://www.mirbsd.org/mksh.htm' @@ -13,14 +13,18 @@ depends=('gcc-libs') install=mksh.install source=("https://www.mirbsd.org/MirOS/dist/mir/mksh/$pkgname-$pkgver.tgz" 'https://www.mirbsd.org/TaC-mksh.txt') -md5sums=('71c7cbcd78306897801b8b6691091e66' - 'a231b325d5f2155a6c667a9323986718') +md5sums=('f714fbe2caf2bbcc592a97515ac2fda5' + '0601617f19e1c0423cbdb8599e16eec3') + +check() { + cd "$srcdir/$pkgname" + ./test.sh +} build() { cd "$srcdir/$pkgname" sh Build.sh -r -c lto - ./test.sh } package() { diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD index 9128d4372..75cc0d86d 100644 --- a/community/pidgin-lwqq/PKGBUILD +++ b/community/pidgin-lwqq/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 95053 2013-08-04 16:26:37Z fyan $ +# $Id: PKGBUILD 95726 2013-08-16 07:23:39Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=pidgin-lwqq -pkgver=0.2a.20130802 -_commit=bccb4d20b65e504f6ae575f7cc55babb9c66ff8d +pkgver=0.2a.20130816 +_commit=dbd57d99769303f86f5c9aa66a7383a719a22dc7 pkgrel=1 pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol" arch=('i686' 'x86_64') diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 897537c1c..554227997 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193065 2013-08-15 12:08:14Z allan $ +# $Id: PKGBUILD 193120 2013-08-16 21:44:47Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,7 +6,7 @@ pkgname=glibc pkgver=2.18 -pkgrel=1 +pkgrel=2 pkgdesc="GNU C Library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libc" @@ -20,24 +20,36 @@ backup=(etc/gai.conf options=('!strip') install=glibc.install source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig} + glibc-2.18-readdir_r-CVE-2013-4237.patch + glibc-2.18-strstr-hackfix.patch nscd.service nscd.tmpfiles locale.gen.txt locale-gen) md5sums=('88fbbceafee809e82efd52efa1e3c58f' 'SKIP' + '154da6bf5a5248f42a7bf5bf08e01a47' + '4441f6dfe7d75ced1fa75e54dd21d36e' 'd5fab2cd3abea65aa5ae696ea4a47d6b' 'da662ca76e7c8d7efbc7986ab7acea2d' '07ac979b6ab5eeb778d55f041529d623' '476e9113489f93b348b21e144b6a8fcf') -build() { +prepare() { cd ${srcdir}/${pkgname}-${pkgver} + + # upstream commit 91ce4085 + patch -p1 -i $srcdir/glibc-2.18-readdir_r-CVE-2013-4237.patch + + # hack fix for strstr issues on x86 + patch -p1 -i $srcdir/glibc-2.18-strstr-hackfix.patch - cd ${srcdir} - mkdir glibc-build - cd glibc-build + mkdir ${srcdir}/glibc-build +} + +build() { + cd ${srcdir}/glibc-build if [[ ${CARCH} = "i686" ]]; then # Hack to fix NPTL issues with Xen, only required on 32bit platforms diff --git a/core/glibc/glibc-2.18-readdir_r-CVE-2013-4237.patch b/core/glibc/glibc-2.18-readdir_r-CVE-2013-4237.patch new file mode 100644 index 000000000..7277ca229 --- /dev/null +++ b/core/glibc/glibc-2.18-readdir_r-CVE-2013-4237.patch @@ -0,0 +1,281 @@ +diff --git a/manual/conf.texi b/manual/conf.texi +index 7eb8b36..c720063 100644 +--- a/manual/conf.texi ++++ b/manual/conf.texi +@@ -1149,6 +1149,9 @@ typed ahead as input. @xref{I/O Queues}. + @deftypevr Macro int NAME_MAX + The uniform system limit (if any) for the length of a file name component, not + including the terminating null character. ++ ++@strong{Portability Note:} On some systems, @theglibc{} defines ++@code{NAME_MAX}, but does not actually enforce this limit. + @end deftypevr + + @comment limits.h +@@ -1157,6 +1160,9 @@ including the terminating null character. + The uniform system limit (if any) for the length of an entire file name (that + is, the argument given to system calls such as @code{open}), including the + terminating null character. ++ ++@strong{Portability Note:} @Theglibc{} does not enforce this limit ++even if @code{PATH_MAX} is defined. + @end deftypevr + + @cindex limits, pipe buffer size +@@ -1476,6 +1482,9 @@ Inquire about the value of @code{POSIX_REC_MIN_XFER_SIZE}. + Inquire about the value of @code{POSIX_REC_XFER_ALIGN}. + @end table + ++@strong{Portability Note:} On some systems, @theglibc{} does not ++enforce @code{_PC_NAME_MAX} or @code{_PC_PATH_MAX} limits. ++ + @node Utility Limits + @section Utility Program Capacity Limits + +diff --git a/manual/filesys.texi b/manual/filesys.texi +index 1df9cf2..814c210 100644 +--- a/manual/filesys.texi ++++ b/manual/filesys.texi +@@ -444,9 +444,9 @@ symbols are declared in the header file @file{dirent.h}. + @comment POSIX.1 + @deftypefun {struct dirent *} readdir (DIR *@var{dirstream}) + This function reads the next entry from the directory. It normally +-returns a pointer to a structure containing information about the file. +-This structure is statically allocated and can be rewritten by a +-subsequent call. ++returns a pointer to a structure containing information about the ++file. This structure is associated with the @var{dirstream} handle ++and can be rewritten by a subsequent call. + + @strong{Portability Note:} On some systems @code{readdir} may not + return entries for @file{.} and @file{..}, even though these are always +@@ -461,19 +461,61 @@ conditions are defined for this function: + The @var{dirstream} argument is not valid. + @end table + +-@code{readdir} is not thread safe. Multiple threads using +-@code{readdir} on the same @var{dirstream} may overwrite the return +-value. Use @code{readdir_r} when this is critical. ++To distinguish between an end-of-directory condition or an error, you ++must set @code{errno} to zero before calling @code{readdir}. To avoid ++entering an infinite loop, you should stop reading from the directory ++after the first error. ++ ++In POSIX.1-2008, @code{readdir} is not thread-safe. In @theglibc{} ++implementation, it is safe to call @code{readdir} concurrently on ++different @var{dirstream}s, but multiple threads accessing the same ++@var{dirstream} result in undefined behavior. @code{readdir_r} is a ++fully thread-safe alternative, but suffers from poor portability (see ++below). It is recommended that you use @code{readdir}, with external ++locking if multiple threads access the same @var{dirstream}. + @end deftypefun + + @comment dirent.h + @comment GNU + @deftypefun int readdir_r (DIR *@var{dirstream}, struct dirent *@var{entry}, struct dirent **@var{result}) +-This function is the reentrant version of @code{readdir}. Like +-@code{readdir} it returns the next entry from the directory. But to +-prevent conflicts between simultaneously running threads the result is +-not stored in statically allocated memory. Instead the argument +-@var{entry} points to a place to store the result. ++This function is a version of @code{readdir} which performs internal ++locking. Like @code{readdir} it returns the next entry from the ++directory. To prevent conflicts between simultaneously running ++threads the result is stored inside the @var{entry} object. ++ ++@strong{Portability Note:} It is recommended to use @code{readdir} ++instead of @code{readdir_r} for the following reasons: ++ ++@itemize @bullet ++@item ++On systems which do not define @code{NAME_MAX}, it may not be possible ++to use @code{readdir_r} safely because the caller does not specify the ++length of the buffer for the directory entry. ++ ++@item ++On some systems, @code{readdir_r} cannot read directory entries with ++very long names. If such a name is encountered, @theglibc{} ++implementation of @code{readdir_r} returns with an error code of ++@code{ENAMETOOLONG} after the final directory entry has been read. On ++other systems, @code{readdir_r} may return successfully, but the ++@code{d_name} member may not be NUL-terminated or may be truncated. ++ ++@item ++POSIX-1.2008 does not guarantee that @code{readdir} is thread-safe, ++even when access to the same @var{dirstream} is serialized. But in ++current implementations (including @theglibc{}), it is safe to call ++@code{readdir} concurrently on different @var{dirstream}s, so there is ++no need to use @code{readdir_r} in most multi-threaded programs. In ++the rare case that multiple threads need to read from the same ++@var{dirstream}, it is still better to use @code{readdir} and external ++synchronization. ++ ++@item ++It is expected that future versions of POSIX will obsolete ++@code{readdir_r} and mandate the level of thread safety for ++@code{readdir} which is provided by @theglibc{} and other ++implementations today. ++@end itemize + + Normally @code{readdir_r} returns zero and sets @code{*@var{result}} + to @var{entry}. If there are no more entries in the directory or an +@@ -481,15 +523,6 @@ error is detected, @code{readdir_r} sets @code{*@var{result}} to a + null pointer and returns a nonzero error code, also stored in + @code{errno}, as described for @code{readdir}. + +-@strong{Portability Note:} On some systems @code{readdir_r} may not +-return a NUL terminated string for the file name, even when there is no +-@code{d_reclen} field in @code{struct dirent} and the file +-name is the maximum allowed size. Modern systems all have the +-@code{d_reclen} field, and on old systems multi-threading is not +-critical. In any case there is no such problem with the @code{readdir} +-function, so that even on systems without the @code{d_reclen} member one +-could use multiple threads by using external locking. +- + It is also important to look at the definition of the @code{struct + dirent} type. Simply passing a pointer to an object of this type for + the second parameter of @code{readdir_r} might not be enough. Some +diff --git a/sysdeps/posix/dirstream.h b/sysdeps/posix/dirstream.h +index a7a074d..8e8570d 100644 +--- a/sysdeps/posix/dirstream.h ++++ b/sysdeps/posix/dirstream.h +@@ -39,6 +39,8 @@ struct __dirstream + + off_t filepos; /* Position of next entry to read. */ + ++ int errcode; /* Delayed error code. */ ++ + /* Directory block. */ + char data[0] __attribute__ ((aligned (__alignof__ (void*)))); + }; +diff --git a/sysdeps/posix/opendir.c b/sysdeps/posix/opendir.c +index ddfc3a7..fc05b0f 100644 +--- a/sysdeps/posix/opendir.c ++++ b/sysdeps/posix/opendir.c +@@ -231,6 +231,7 @@ __alloc_dir (int fd, bool close_fd, int flags, const struct stat64 *statp) + dirp->size = 0; + dirp->offset = 0; + dirp->filepos = 0; ++ dirp->errcode = 0; + + return dirp; + } +diff --git a/sysdeps/posix/readdir_r.c b/sysdeps/posix/readdir_r.c +index b5a8e2e..8ed5c3f 100644 +--- a/sysdeps/posix/readdir_r.c ++++ b/sysdeps/posix/readdir_r.c +@@ -40,6 +40,7 @@ __READDIR_R (DIR *dirp, DIRENT_TYPE *entry, DIRENT_TYPE **result) + DIRENT_TYPE *dp; + size_t reclen; + const int saved_errno = errno; ++ int ret; + + __libc_lock_lock (dirp->lock); + +@@ -70,10 +71,10 @@ __READDIR_R (DIR *dirp, DIRENT_TYPE *entry, DIRENT_TYPE **result) + bytes = 0; + __set_errno (saved_errno); + } ++ if (bytes < 0) ++ dirp->errcode = errno; + + dp = NULL; +- /* Reclen != 0 signals that an error occurred. */ +- reclen = bytes != 0; + break; + } + dirp->size = (size_t) bytes; +@@ -106,29 +107,46 @@ __READDIR_R (DIR *dirp, DIRENT_TYPE *entry, DIRENT_TYPE **result) + dirp->filepos += reclen; + #endif + +- /* Skip deleted files. */ ++#ifdef NAME_MAX ++ if (reclen > offsetof (DIRENT_TYPE, d_name) + NAME_MAX + 1) ++ { ++ /* The record is very long. It could still fit into the ++ caller-supplied buffer if we can skip padding at the ++ end. */ ++ size_t namelen = _D_EXACT_NAMLEN (dp); ++ if (namelen <= NAME_MAX) ++ reclen = offsetof (DIRENT_TYPE, d_name) + namelen + 1; ++ else ++ { ++ /* The name is too long. Ignore this file. */ ++ dirp->errcode = ENAMETOOLONG; ++ dp->d_ino = 0; ++ continue; ++ } ++ } ++#endif ++ ++ /* Skip deleted and ignored files. */ + } + while (dp->d_ino == 0); + + if (dp != NULL) + { +-#ifdef GETDENTS_64BIT_ALIGNED +- /* The d_reclen value might include padding which is not part of +- the DIRENT_TYPE data structure. */ +- reclen = MIN (reclen, +- offsetof (DIRENT_TYPE, d_name) + sizeof (dp->d_name)); +-#endif + *result = memcpy (entry, dp, reclen); +-#ifdef GETDENTS_64BIT_ALIGNED ++#ifdef _DIRENT_HAVE_D_RECLEN + entry->d_reclen = reclen; + #endif ++ ret = 0; + } + else +- *result = NULL; ++ { ++ *result = NULL; ++ ret = dirp->errcode; ++ } + + __libc_lock_unlock (dirp->lock); + +- return dp != NULL ? 0 : reclen ? errno : 0; ++ return ret; + } + + #ifdef __READDIR_R_ALIAS +diff --git a/sysdeps/posix/rewinddir.c b/sysdeps/posix/rewinddir.c +index 2935a8e..d4991ad 100644 +--- a/sysdeps/posix/rewinddir.c ++++ b/sysdeps/posix/rewinddir.c +@@ -33,6 +33,7 @@ rewinddir (dirp) + dirp->filepos = 0; + dirp->offset = 0; + dirp->size = 0; ++ dirp->errcode = 0; + #ifndef NOT_IN_libc + __libc_lock_unlock (dirp->lock); + #endif +diff --git a/sysdeps/unix/sysv/linux/i386/readdir64_r.c b/sysdeps/unix/sysv/linux/i386/readdir64_r.c +index 8ebbcfd..a7d114e 100644 +--- a/sysdeps/unix/sysv/linux/i386/readdir64_r.c ++++ b/sysdeps/unix/sysv/linux/i386/readdir64_r.c +@@ -18,7 +18,6 @@ + #define __READDIR_R __readdir64_r + #define __GETDENTS __getdents64 + #define DIRENT_TYPE struct dirent64 +-#define GETDENTS_64BIT_ALIGNED 1 + + #include <sysdeps/posix/readdir_r.c> + +diff --git a/sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c b/sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c +index 5ed8e95..290f2c8 100644 +--- a/sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c ++++ b/sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c +@@ -1,5 +1,4 @@ + #define readdir64_r __no_readdir64_r_decl +-#define GETDENTS_64BIT_ALIGNED 1 + #include <sysdeps/posix/readdir_r.c> + #undef readdir64_r + weak_alias (__readdir_r, readdir64_r) +-- +1.8.3.4 + diff --git a/core/glibc/glibc-2.18-strstr-hackfix.patch b/core/glibc/glibc-2.18-strstr-hackfix.patch new file mode 100644 index 000000000..6149f88bc --- /dev/null +++ b/core/glibc/glibc-2.18-strstr-hackfix.patch @@ -0,0 +1,13 @@ +diff --git a/sysdeps/x86_64/multiarch/strstr.c b/sysdeps/x86_64/multiarch/strstr.c +index cd63b68..03d8b9a 100644 +--- a/sysdeps/x86_64/multiarch/strstr.c ++++ b/sysdeps/x86_64/multiarch/strstr.c +@@ -86,7 +86,7 @@ + /* Simple replacement of movdqu to address 4KB boundary cross issue. + If EOS occurs within less than 16B before 4KB boundary, we don't + cross to next page. */ +-static __m128i ++static inline __m128i + __m128i_strloadu (const unsigned char * p, __m128i zero) + { + if (__builtin_expect ((int) ((size_t) p & 0xfff) > 0xff0, 0)) diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index 241a993e8..de1f4c38f 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,12 +1,11 @@ -# $Id: PKGBUILD 191886 2013-08-01 06:53:20Z bpiotrowski $ +# $Id: PKGBUILD 193110 2013-08-16 13:35:31Z andrea $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=amarok -replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') -pkgver=2.7.1 -pkgrel=3 +pkgver=2.8.0 +pkgrel=1 pkgdesc="The powerful music player for KDE" arch=("i686" "x86_64") url="http://amarok.kde.org/" @@ -22,16 +21,11 @@ optdepends=("libgpod: support for Apple iPod audio devices" "libmygpo-qt: gpodder.net Internet Service" "clamz: allow to download songs from Amazon.com") install="${pkgname}.install" -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" - 'kde411.patch') -sha1sums=('445eba6aaadface756410cf0f568a3770d437d2d' - 'c2fd0153ec622fccac47ebd31a1b0548c6222541') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('e76ccd53c05d57f9457d74cd08c2c41383c00937') prepare() { mkdir build - - cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/kde411.patch } build() { diff --git a/extra/amarok/kde411.patch b/extra/amarok/kde411.patch deleted file mode 100644 index 8099a4432..000000000 --- a/extra/amarok/kde411.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit e899704b3db4af2ff228eb0d4dbbec05fb9a2448 -Author: Hrvoje Senjan <hrvoje.senjan@gmail.com> -Date: Mon Jun 10 09:26:37 2013 +0200 - - Remove usage of (fake) Amarok-Mockup theme - - This is due to https://bugs.kde.org/show_bug.cgi?id=320855 - Amarok-Mockup is unused, as far i can see, and also makes Amarok crash with kdelibs master/4.11 - If it is still needed, or there is a better solution, i'll discard the review... - - From 6b85a2899a30db5acebee92182a67778499a8d9e Mon Sep 17 00:00:00 2001 - From: Hrvoje Senjan <hrvoje.senjan@gmail.com> - Date: Sun, 9 Jun 2013 19:55:58 +0200 - Subject: [PATCH 1/1] Kill Amarok-Mockup - - BUG: 320855 - FIXED-IN: 2.8 - REVIEW: 110917 - -diff --git a/src/context/ContextView.cpp b/src/context/ContextView.cpp -index f61518f..152f8da 100644 ---- a/src/context/ContextView.cpp -+++ b/src/context/ContextView.cpp -@@ -78,11 +78,6 @@ ContextView::ContextView( Plasma::Containment *cont, Plasma::Corona *corona, QWi - p.setColor( QPalette::Base, c ); - setPalette( p ); - -- PERF_LOG( "Accessing Plasma::Theme" ); -- // here we initialize all the Plasma paths to Amarok paths -- Plasma::Theme::defaultTheme()->setUseGlobalSettings( false ); -- Theme::defaultTheme()->setThemeName( "Amarok-Mockup" ); -- PERF_LOG( "Access to Plasma::Theme complete" ) - contextScene()->setAppletMimeType( "text/x-amarokappletservicename" ); - - cont->setPos( 0, 0 ); diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 747f9469f..e8d4742ea 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189704 2013-07-05 05:55:47Z pierre $ +# $Id: PKGBUILD 193093 2013-08-16 07:06:58Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -21,7 +21,7 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.4.17 +pkgver=5.4.18 pkgrel=1 arch=('i686' 'x86_64') license=('PHP') @@ -33,7 +33,7 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx' source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" 'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') -md5sums=('1e027e99e2a874310fd518e87e3947af' +md5sums=('b2e185b46b22a48a385cf21a0dc76e65' '44c1bb1df346b3b9d3e092c7df9a37d0' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' '5c1f4c967b66ce3eaf819b46951dcbf5' diff --git a/extra/rdesktop/PKGBUILD b/extra/rdesktop/PKGBUILD index f3cb15605..7558c06e5 100644 --- a/extra/rdesktop/PKGBUILD +++ b/extra/rdesktop/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 192435 2013-08-11 19:09:27Z eric $ +# $Id: PKGBUILD 193090 2013-08-15 23:15:47Z eric $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Dan McGee <dan@archlinux.org> pkgname=rdesktop pkgver=1.8.0 -pkgrel=2 +pkgrel=3 pkgdesc="An open source client for Windows Remote Desktop Services" arch=('i686' 'x86_64') url="http://www.rdesktop.org/" license=('GPL3') depends=('libao' 'libsamplerate' 'xorg-xrandr' 'pcsclite') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'rdesktop-send_physical_buttons.diff' 'rdesktop-libao.patch' 'rdesktop-tcp.patch') -md5sums=('203d662ac20b22250bbbd525a9f29f3a' - 'cbfb12729e7f28e497afb883cc42022b' - '6514f31dc879a0a66c955e4e3348c143' - 'f204fd8a40b16ca10d4962d4eaeca4db') + 'rdesktop-send_physical_buttons.diff' 'rdesktop-libao.patch' 'rdesktop-tcp.patch' + rdesktop-r1729.patch rdesktop-r1731.patch rdesktop-r1732.patch) +sha1sums=('2d39a41d29ad1ad2509d1e343a2817a3c7d666de' + '809a9dc11ad4f704f79fc4bc2a70b76a4f42596d' + '68a48061e5ed76150c1444891a192f7884fd056e' + 'a14793c72194bed74725bcf75fdb8b93c7577399' + '972d6ec59cf140383880464e3ef43e03969f3bfe' + '9a417aba27ded0ab595cbb07fccd452bdc0af20c' + '1bc92e04058a2f5c02f42a5c97da7ee672a71698') prepare() { cd ${pkgname}-${pkgver} @@ -29,6 +33,11 @@ prepare() { # FS#36488 patch -i "${srcdir}/rdesktop-tcp.patch" + patch -i "${srcdir}/rdesktop-r1731.patch" + patch -i "${srcdir}/rdesktop-r1732.patch" + + # FS#36505 + patch -i "${srcdir}/rdesktop-r1729.patch" } build() { diff --git a/extra/rdesktop/rdesktop-libao.patch b/extra/rdesktop/rdesktop-libao.patch index 1dcbdddce..9def24443 100644 --- a/extra/rdesktop/rdesktop-libao.patch +++ b/extra/rdesktop/rdesktop-libao.patch @@ -1,19 +1,12 @@ -diff -up rdesktop-1.6.0/rdpsnd_libao.c.ao rdesktop-1.6.0/rdpsnd_libao.c ---- rdesktop-1.6.0/rdpsnd_libao.c.ao 2007-10-30 14:57:30.000000000 +0100 -+++ rdesktop-1.6.0/rdpsnd_libao.c 2010-12-02 21:22:39.000000000 +0100 -@@ -76,6 +76,7 @@ libao_open(void) - format.channels = 2; - format.rate = 44100; - format.byte_format = AO_FMT_NATIVE; -+ format.matrix = NULL; +Index: rdpsnd_libao.c +=================================================================== +--- rdpsnd_libao.c (revision 1729) ++++ rdpsnd_libao.c (revision 1730) +@@ -111,6 +111,7 @@ + { + ao_sample_format format; - o_device = ao_open_live(default_driver, &format, NULL); - if (o_device == NULL) -@@ -115,6 +115,7 @@ libao_set_format(RD_WAVEFORMATEX * pwfx) ++ memset(&format, 0, sizeof(format)); + format.bits = pwfx->wBitsPerSample; format.channels = pwfx->nChannels; format.rate = 44100; - format.byte_format = AO_FMT_NATIVE; -+ format.matrix = NULL; - - if (o_device != NULL) - ao_close(o_device); diff --git a/extra/rdesktop/rdesktop-r1729.patch b/extra/rdesktop/rdesktop-r1729.patch new file mode 100644 index 000000000..3f38a692c --- /dev/null +++ b/extra/rdesktop/rdesktop-r1729.patch @@ -0,0 +1,33 @@ +Index: scard.c +=================================================================== +--- scard.c (revision 1728) ++++ scard.c (revision 1729) +@@ -2,8 +2,8 @@ + rdesktop: A Remote Desktop Protocol client. + Smart Card support + Copyright (C) Alexi Volkov <alexi@myrealbox.com> 2006 +- Copyright 2010 Pierre Ossman <ossman@cendio.se> for Cendio AB +- Copyright 2011 Henrik Andersson <hean01@cendio.se> for Cendio AB ++ Copyright 2010-2013 Pierre Ossman <ossman@cendio.se> for Cendio AB ++ Copyright 2011-2013 Henrik Andersson <hean01@cendio.se> for Cendio AB + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by +@@ -1109,6 +1109,7 @@ + MYPCSC_SCARDCONTEXT myHContext; + SERVER_DWORD dwTimeout; + SERVER_DWORD dwCount; ++ SERVER_DWORD dwPointerId; + SERVER_LPSCARD_READERSTATE_A rsArray, cur; + MYPCSC_LPSCARD_READERSTATE_A myRsArray; + long i; +@@ -1133,7 +1134,8 @@ + memset(rsArray, 0, dwCount * sizeof(SERVER_SCARD_READERSTATE_A)); + for (i = 0, cur = rsArray; i < dwCount; i++, cur++) + { +- in_uint32_le(in, cur->szReader); ++ in_uint32_le(in, dwPointerId); ++ cur->szReader = (char *)(intptr_t)dwPointerId; + in_uint32_le(in, cur->dwCurrentState); + in_uint32_le(in, cur->dwEventState); + in_uint32_le(in, cur->cbAtr); diff --git a/extra/rdesktop/rdesktop-r1731.patch b/extra/rdesktop/rdesktop-r1731.patch new file mode 100644 index 000000000..f72728191 --- /dev/null +++ b/extra/rdesktop/rdesktop-r1731.patch @@ -0,0 +1,13 @@ +Index: rdesktop.c +=================================================================== +--- rdesktop.c (revision 1730) ++++ rdesktop.c (revision 1731) +@@ -87,7 +87,7 @@ + RD_BOOL g_sendmotion = True; + RD_BOOL g_bitmap_cache = True; + RD_BOOL g_bitmap_cache_persist_enable = False; +-RD_BOOL g_bitmap_cache_precache = True; ++RD_BOOL g_bitmap_cache_precache = False; + RD_BOOL g_use_ctrl = True; + RD_BOOL g_encryption = True; + RD_BOOL g_encryption_initial = True; diff --git a/extra/rdesktop/rdesktop-r1732.patch b/extra/rdesktop/rdesktop-r1732.patch new file mode 100644 index 000000000..a4260d0d0 --- /dev/null +++ b/extra/rdesktop/rdesktop-r1732.patch @@ -0,0 +1,73 @@ +Index: proto.h +=================================================================== +--- proto.h (revision 1731) ++++ proto.h (revision 1732) +@@ -144,6 +144,7 @@ + char *l_to_a(long N, int base); + int load_licence(unsigned char **data); + void save_licence(unsigned char *data, int length); ++void rd_create_ui(void); + RD_BOOL rd_pstcache_mkdir(void); + int rd_open_file(char *filename); + void rd_close_file(int fd); +Index: rdp.c +=================================================================== +--- rdp.c (revision 1731) ++++ rdp.c (revision 1732) +@@ -1044,6 +1044,9 @@ + uint8 type; + uint16 len_src_descriptor, len_combined_caps; + ++ /* at this point we need to ensure that we have ui created */ ++ rd_create_ui(); ++ + in_uint32_le(s, g_rdp_shareid); + in_uint16_le(s, len_src_descriptor); + in_uint16_le(s, len_combined_caps); +Index: rdesktop.c +=================================================================== +--- rdesktop.c (revision 1731) ++++ rdesktop.c (revision 1732) +@@ -87,7 +87,7 @@ + RD_BOOL g_sendmotion = True; + RD_BOOL g_bitmap_cache = True; + RD_BOOL g_bitmap_cache_persist_enable = False; +-RD_BOOL g_bitmap_cache_precache = False; ++RD_BOOL g_bitmap_cache_precache = True; + RD_BOOL g_use_ctrl = True; + RD_BOOL g_encryption = True; + RD_BOOL g_encryption_initial = True; +@@ -1132,13 +1132,7 @@ + DEBUG(("Connection successful.\n")); + memset(password, 0, sizeof(password)); + +- /* only create a window if we dont have one intialized */ +- if (!ui_have_window()) +- { +- if (!ui_create_window()) +- return EX_OSERR; +- } +- ++ rd_create_ui(); + tcp_run_ui(True); + + g_redirect = False; +@@ -1732,6 +1726,18 @@ + close(fd); + } + ++/* create rdesktop ui */ ++void ++rd_create_ui() ++{ ++ /* only create a window if we dont have one intialized */ ++ if (!ui_have_window()) ++ { ++ if (!ui_create_window()) ++ return EX_OSERR; ++ } ++} ++ + /* Create the bitmap cache directory */ + RD_BOOL + rd_pstcache_mkdir(void) diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 1d08b5634..1a0bff6b6 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 95317 2013-08-09 09:19:46Z jelle $ +# $Id: PKGBUILD 95754 2013-08-16 10:44:14Z jelle $ # Maintainer: jelle van der Waa <jelle@vdwaa.nl> # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -9,8 +9,8 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=0.9.43 -pkgrel=2 +pkgver=0.9.44 +pkgrel=1 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed" arch=('i686' 'x86_64' 'mips64el') url="http://calibre-ebook.com/" @@ -30,7 +30,7 @@ install=calibre.install source=("http://sourceforge.net/projects/calibre/files/${pkgver}/calibre-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('63e78929c62ae838b767c95b0830eb31' +md5sums=('5598d6717ce568a32ea2a4a1c173016b' '8353d1878c5a498b3e49eddef473605f' '675cd87d41342119827ef706055491e7') diff --git a/pcr/econnman/PKGBUILD b/pcr/econnman/PKGBUILD new file mode 100644 index 000000000..a6419abc0 --- /dev/null +++ b/pcr/econnman/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Doug Newgard <scimmia22 at outlook dot com> + +pkgname=econnman +pkgver=1 +pkgrel=1 +pkgdesc="Enlightenment ConnMan user interface" +arch=('any') +url="http://www.enlightenment.org" +license=('LGPL3') +depends=('python2-elementary' 'python2-e_dbus' 'python2-edje' 'python2-ecore' 'connman') +conflicts=('econnman-svn') +source=("http://packages.profusion.mobi/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('cec2bd0aaf9d8975dd69ac6b5a4e638e') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + sed -i 's:/usr/bin/python:/usr/bin/python2:g' econnman-bin.in + + PYTHON=/usr/bin/python2 \ + ./configure --prefix=/usr + + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} + diff --git a/pcr/freetuxtv/PKGBUILD b/pcr/freetuxtv/PKGBUILD new file mode 100644 index 000000000..be9eb6759 --- /dev/null +++ b/pcr/freetuxtv/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Bernard Baeyens (berbae) <berbae52 at sfr dot fr> +pkgname=freetuxtv +pkgver=0.6.5 +pkgrel=3 +pkgdesc="WebTV player to watch ADSL TV on the PC." +arch=('i686' 'x86_64') +url="http://code.google.com/p/freetuxtv/" +license=('GPL3') +depends=('vlc' 'gtk2' 'sqlite' 'curl' 'libnotify' 'dbus-glib') +makedepends=('intltool') +conflicts=('freetuxtv-svn') + +source=("http://freetuxtv.googlecode.com/files/$pkgname-$pkgver.tar.gz") +sha1sums=('f347a6fd107f9722f4f6be4ec8f530239ffe899a') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --with-gtk=2.0 + make +} +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/pcr/msdl/PKGBUILD b/pcr/msdl/PKGBUILD new file mode 100644 index 000000000..dfcf99c03 --- /dev/null +++ b/pcr/msdl/PKGBUILD @@ -0,0 +1,29 @@ +# Contributor: Nathan Owe ndowens04 at gmail dot com +# Contributor: noonov <noonov@gmail.com> + +pkgname=msdl +pkgver=1.2.7_r2 +_pkgver=${pkgver/_/-} +pkgrel=1 +pkgdesc="A multi-protocol downloader for various streaming protocols" +arch=('i686' 'x86_64') +url="http://msdl.sourceforge.net/" +license=('GPL3') +depends=('glibc') +source=(http://downloads.sourceforge.net/msdl/${pkgname}-${_pkgver}.tar.gz) + +build() { + cd ${srcdir}/${pkgname}-${_pkgver} + + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/${pkgname}-${_pkgver} + + make DESTDIR=${pkgdir} install +} + +md5sums=('a2b37162115170cc59ff6ace1d9c5ac4') + diff --git a/pcr/plowshare/PKGBUILD b/pcr/plowshare/PKGBUILD index cc2fd08ef..ef6e66d77 100644 --- a/pcr/plowshare/PKGBUILD +++ b/pcr/plowshare/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: breakdown <breakdown(at)archlinux(dot)us> pkgname=plowshare -pkgver=snapshot_git20130401.7b374cb +pkgver=snapshot_git20130727.5740aff pkgrel=1 pkgdesc="Command-line downloader and uploader for Rapidshare, Mediafire and other file sharing websites." arch=('any') @@ -15,7 +15,7 @@ optdepends=('bash-completion: enable bash auto completion' 'aview: ascii display for no X server') conflicts=("$pkgname-git") source=("http://$pkgname.googlecode.com/files/${pkgname}4-${pkgver/_/-}.tar.gz") -md5sums=('edcc004c9432c22644a44f97c2cd5992') +md5sums=('fb992180ff1515bc1b69b4ac012e8f05') package() { cd "$srcdir/${pkgname}4-${pkgver/_/-}" diff --git a/pcr/python2-e_dbus/PKGBUILD b/pcr/python2-e_dbus/PKGBUILD new file mode 100644 index 000000000..0cff13210 --- /dev/null +++ b/pcr/python2-e_dbus/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: Doug Newgard <scimmia22 at outlook dot com> + +pkgname=python2-e_dbus +_pkgname=python-e_dbus +pkgver=1.7.0 +pkgrel=1 +pkgdesc="Python2 bindings for E_Dbus" +arch=('i686' 'x86_64') +url="http://www.enlightenment.org" +license=('LGPL2.1') +depends=('e_dbus' 'python2' 'python2-dbus') +options=('!libtool' '!emptydirs') +source=("http://download.enlightenment.org/releases/BINDINGS/python/$_pkgname-$pkgver.tar.bz2") +md5sums=('40b479444bb06147429a276127981890') + +build() { + cd "$srcdir/$_pkgname-$pkgver" + + PYTHON=/usr/bin/python2 \ + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/pcr/python2-ecore/PKGBUILD b/pcr/python2-ecore/PKGBUILD new file mode 100644 index 000000000..e4837c704 --- /dev/null +++ b/pcr/python2-ecore/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: Doug Newgard <scimmia22 at outlook dot com> + +pkgname=python2-ecore +_pkgname=python-ecore +pkgver=1.7.0 +pkgrel=1 +pkgdesc="Python2 bindings for Ecore" +arch=('i686' 'x86_64') +url="http://www.enlightenment.org" +license=('LGPL2.1') +depends=('ecore' 'python2-evas') +makedepends=('cython2') +options=('!libtool' '!emptydirs') +source=("http://download.enlightenment.org/releases/BINDINGS/python/$_pkgname-$pkgver.tar.bz2") +md5sums=('15dd908b71d09ef30f7e758739f3b6fd') + +build() { + cd "$srcdir/$_pkgname-$pkgver" + + PYTHON=/usr/bin/python2 \ + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + diff --git a/pcr/python2-edje/PKGBUILD b/pcr/python2-edje/PKGBUILD new file mode 100644 index 000000000..5a63b993f --- /dev/null +++ b/pcr/python2-edje/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: Doug Newgard <scimmia22 at outlook dot com> + +pkgname=python2-edje +_pkgname=python-edje +pkgver=1.7.0 +pkgrel=1 +pkgdesc="Python2 bindings for Edje" +arch=('i686' 'x86_64') +url="http://www.enlightenment.org" +license=('LGPL2.1') +depends=('edje' 'python2-evas') +makedepends=('cython2') +options=('!libtool' '!emptydirs') +source=("http://download.enlightenment.org/releases/BINDINGS/python/$_pkgname-$pkgver.tar.bz2") +md5sums=('1e0d7a4a4504298caaad0cee476e4edb') + +build() { + cd "$srcdir/$_pkgname-$pkgver" + + PYTHON=/usr/bin/python2 \ + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + diff --git a/pcr/python2-elementary/PKGBUILD b/pcr/python2-elementary/PKGBUILD new file mode 100644 index 000000000..9372e9445 --- /dev/null +++ b/pcr/python2-elementary/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: Doug Newgard <scimmia22 at outlook dot com> + +pkgname=python2-elementary +_pkgname=python-elementary +pkgver=1.7.0 +pkgrel=1 +pkgdesc="Python2 bindings for Elementary" +arch=('i686' 'x86_64') +url="http://www.enlightenment.org" +license=('LGPL2.1') +depends=('elementary' 'python2-evas') +makedepends=('cython2') +options=('!libtool' '!emptydirs') +source=("http://download.enlightenment.org/releases/BINDINGS/python/$_pkgname-$pkgver.tar.bz2") +md5sums=('38c8b2ac508ab4e1d12f1557a12169c9') + +build() { + cd "$srcdir/$_pkgname-$pkgver" + + PYTHON=/usr/bin/python2 \ + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + diff --git a/pcr/python2-evas/PKGBUILD b/pcr/python2-evas/PKGBUILD new file mode 100644 index 000000000..7f66df658 --- /dev/null +++ b/pcr/python2-evas/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Doug Newgard <scimmia22 at outlook dot com> + +pkgname=python2-evas +_pkgname=python-evas +pkgver=1.7.0 +pkgrel=1 +pkgdesc="Python2 bindings for Evas" +arch=('i686' 'x86_64') +url="http://www.enlightenment.org" +license=('LGPL2.1') +depends=('evas' 'python2') +makedepends=('cython2') +options=('!libtool' '!emptydirs') +source=("http://download.enlightenment.org/releases/BINDINGS/python/$_pkgname-$pkgver.tar.bz2") +md5sums=('c3fda2025171f5e3d2bc224e8bae88e5') + +build() { + cd "$srcdir/$_pkgname-$pkgver" + + PYTHON=/usr/bin/python2 \ + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/pcr/steadyflow/PKGBUILD b/pcr/steadyflow/PKGBUILD new file mode 100644 index 000000000..a9381448e --- /dev/null +++ b/pcr/steadyflow/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: M0Rf30 +# Contributor: Dan Serban +# Contributor: zbito <ztokarczyk at gmail dot com + +pkgname=steadyflow +pkgver=0.2.0 +pkgrel=3 +pkgdesc="A download manager that aims for minimalism, ease of use, and a +clean, malleable codebase" +arch=('i686' 'x86_64') +url=https://launchpad.net/steadyflow +license=('GPL3') +install=steadyflow.install +depends=('desktop-file-utils' 'glib2' 'gtk3' 'gvfs' 'libgee' 'libnotify' +'libunique' 'libgee06') +makedepends=('cmake' 'vala') +conflicts=('steadyflow-bzr') +source=(http://launchpad.net/$pkgname/trunk/$pkgver/+download/$pkgname-$pkgver.tar.xz https://launchpadlibrarian.net/55910801/steadyflow-64px.png) +md5sums=('16b9907c1d681e7f0a861f066d4fda0e' 'bbe025886f071ebfffa5fed350cced0c') + +build() { + cd $pkgname-$pkgver + cmake -DCMAKE_INSTALL_PREFIX='/usr' -DCOMPILE_GSETTINGS_ON_INSTALL=NO -DWANT_AYATANA=NO + make +} + +package() { + cd $pkgname-$pkgver + make install DESTDIR="$pkgdir" + mkdir -p "$pkgdir"/usr/share/pixmaps + cp "$srcdir"/steadyflow-64px.png "$pkgdir"/usr/share/pixmaps/steadyflow.png +} + diff --git a/pcr/steadyflow/steadyflow.install b/pcr/steadyflow/steadyflow.install new file mode 100644 index 000000000..01434bc04 --- /dev/null +++ b/pcr/steadyflow/steadyflow.install @@ -0,0 +1,17 @@ +post_install() +{ + glib-compile-schemas usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() +{ + post_install $1 +} + +post_remove() +{ + post_install $1 +} + diff --git a/pcr/textext/LICENSE.txt b/pcr/textext/LICENSE.txt new file mode 100644 index 000000000..69f5d4720 --- /dev/null +++ b/pcr/textext/LICENSE.txt @@ -0,0 +1,28 @@ +Copyright (c) 2007-2008 Pauli Virtanen. + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + a. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + b. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + c. Neither the name of the copyright holder nor the names of the contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/pcr/textext/PKGBUILD b/pcr/textext/PKGBUILD new file mode 100644 index 000000000..8a1897dc4 --- /dev/null +++ b/pcr/textext/PKGBUILD @@ -0,0 +1,22 @@ +# Contributor: Joel Schaerer <joel.schaerer@laposte.net> +# Maintainer: Stefan Husmann <stefan-husmann@t-online.de> +pkgname=textext +pkgver=0.4.4 +pkgrel=3 +pkgdesc="An inkscape extension which lets you add LaTeX equations to your drawings" +arch=('i686' 'x86_64') +license=('BSD') +url="http://pav.iki.fi/software/textext/" +depends=('inkscape' 'texlive-core' 'python2-lxml' 'pdf2svg') +source=(http://pav.iki.fi/software/textext/$pkgname-$pkgver.tar.gz LICENSE.txt) +md5sums=('5dbb18bf762565196f8ac1f68f8607e3' + '91da7de463147c1c78b1c2e6f24da380') +build() { + cd "$srcdir" + install -Dm 644 LICENSE.txt \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt" + install -Dm 755 textext.py \ + "${pkgdir}/usr/share/inkscape/extensions/textext.py" + install -Dm 644 textext.inx \ + "${pkgdir}/usr/share/inkscape/extensions/textext.inx" + } |