summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-04-15 10:12:01 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2013-04-15 10:12:01 +0200
commit9c67fc1a17727682bc753bbd353cf7af6e6099e7 (patch)
tree8c60dcb6992954a61f171ad0ab2f463b6f0d9d1e
parent5e1552e4d38c7ce209ce301f5020793e890366dc (diff)
parent030187a191f576ae92cef43f3c8cd7f1df084b87 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/avr-binutils/PKGBUILD community/ettercap/PKGBUILD community/python2-traits/PKGBUILD
-rw-r--r--community/avr-binutils/PKGBUILD58
-rw-r--r--community/avr-binutils/avr-binutils.install17
-rw-r--r--community/avr-binutils/binutils-2.23.2-texinfo-5.0.patch162
-rw-r--r--community/avr-gcc/PKGBUILD63
-rw-r--r--community/avr-gdb/PKGBUILD19
-rw-r--r--community/ettercap/PKGBUILD30
-rw-r--r--community/ettercap/ettercap-gtk.install12
-rw-r--r--community/ettercap/ettercap.desktop2
-rw-r--r--community/ettercap/org.archlinux.pkexec.ettercap.policy27
-rw-r--r--community/mayavi/PKGBUILD25
-rw-r--r--community/primus/PKGBUILD2
-rw-r--r--community/python2-traits/PKGBUILD17
-rw-r--r--community/task/PKGBUILD10
-rw-r--r--core/kmod/PKGBUILD6
-rw-r--r--extra/net-snmp/PKGBUILD30
-rw-r--r--extra/net-snmp/snmpd.confd5
-rw-r--r--extra/net-snmp/snmpd.rc39
-rw-r--r--extra/net-snmp/snmpd.service3
18 files changed, 348 insertions, 179 deletions
diff --git a/community/avr-binutils/PKGBUILD b/community/avr-binutils/PKGBUILD
index cb5a600a8..636eba978 100644
--- a/community/avr-binutils/PKGBUILD
+++ b/community/avr-binutils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79838 2012-11-13 22:12:42Z schuay $
+# $Id: PKGBUILD 88220 2013-04-14 18:16:45Z schuay $
# Maintainer: schuay <jakob.gruber@gmail.com>
# Contributor: Brad Fanella <bradfanella@archlinux.us>
# Contributor: Corrado Primier <bardo@aur.archlinux.org>
@@ -7,60 +7,70 @@
# Build order: avr-binutils -> avr-gcc -> avr-libc
pkgname=avr-binutils
-pkgver=2.23
-pkgrel=2
-_pkgname=binutils
-pkgdesc="A set of programs to assemble and manipulate binary and object files for the avr architecture"
+pkgver=2.23.2
+pkgrel=1
+pkgdesc="A set of programs to assemble and manipulate binary and object files for the AVR architecture"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnu.org/software/binutils/"
license=('GPL')
-depends=('glibc>=2.16' 'zlib')
+depends=('glibc>=2.17' 'zlib' 'binutils')
provides=("binutils-avr=$pkgver")
replaces=('binutils-avr')
options=('!libtool' '!distcc' '!ccache')
-source=("ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.gz"
- "avr-size.patch")
+install=avr-binutils.install
+source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig}
+ binutils-2.23.2-texinfo-5.0.patch
+ avr-size.patch)
_builddir=binutils-build
build() {
- cd ${srcdir}/${_pkgname}-${pkgver}
+ cd ${srcdir}/binutils-${pkgver}
# See https://bugs.archlinux.org/task/32504
patch -Np0 < ${srcdir}/avr-size.patch
+ # http://sourceware.org/git/?p=binutils.git;a=patch;h=e02bf935
+ # http://sourceware.org/git/?p=binutils.git;a=patch;h=935f8542
+ patch -p1 -i ${srcdir}/binutils-2.23.2-texinfo-5.0.patch
+
+ # https://bugs.archlinux.org/task/34629
+ sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
+
config_guess=$(./config.guess)
cd ${srcdir}
rm -rf ${_builddir}
mkdir ${_builddir} && cd ${_builddir}
- [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib"
-
- ${srcdir}/${_pkgname}-${pkgver}/configure \
+ ${srcdir}/binutils-${pkgver}/configure \
--prefix=/usr \
+ --with-lib-path=/usr/lib:/usr/local/lib \
+ --with-bugurl=https://bugs.archlinux.org/ \
+ --enable-ld=default \
+ --enable-gold \
+ --enable-plugins \
+ --enable-threads \
+ --with-pic \
+ --enable-shared \
+ --disable-werror \
+ --disable-multilib \
--build=${config_guess} \
- --disable-nls \
- --enable-install-libbfd \
- --includedir=/usr/${config_guess}/include \
- --infodir=/usr/share/info \
- --libdir=/usr/lib \
- --mandir=/usr/share/man \
--target=avr \
$CONFIGFLAG
# This checks the host environment and makes sure all the necessary tools are available to compile Binutils.
make configure-host
- make tooldir=${pkgdir}/usr
+ make tooldir=/usr
}
package() {
cd ${srcdir}/${_builddir}
- make DESTDIR=${pkgdir} tooldir=/usr install
+ make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install
- rm -f ${pkgdir}/usr/lib/libiberty.a
+ rm ${pkgdir}/usr/lib/libiberty.a
for bin in ar as nm objcopy objdump ranlib strip ; do
rm -f ${pkgdir}/usr/bin/${bin}
@@ -69,7 +79,11 @@ package() {
for info in as bfd binutils configure gprof ld standards; do
mv ${pkgdir}/usr/share/info/${info}.info ${pkgdir}/usr/share/info/avr-${info}.info
done
+
+ rm -rf ${pkgdir}/usr/share/locale
}
-md5sums=('ed58f50d8920c3f1d9cb110d5c972c27'
+md5sums=('4f8fa651e35ef262edc01d60fb45702e'
+ 'SKIP'
+ '34e439ce23213a91e2af872dfbb5094c'
'573769ec1107d1bfed78680edd7ae63f')
diff --git a/community/avr-binutils/avr-binutils.install b/community/avr-binutils/avr-binutils.install
new file mode 100644
index 000000000..eb066ae3a
--- /dev/null
+++ b/community/avr-binutils/avr-binutils.install
@@ -0,0 +1,17 @@
+infodir=usr/share/info
+filelist=(avr-as.info avr-bfd.info avr-binutils.info avr-configure.info avr-gprof.info avr-ld.info avr-standards.info)
+
+post_upgrade() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
diff --git a/community/avr-binutils/binutils-2.23.2-texinfo-5.0.patch b/community/avr-binutils/binutils-2.23.2-texinfo-5.0.patch
new file mode 100644
index 000000000..38dc19fb0
--- /dev/null
+++ b/community/avr-binutils/binutils-2.23.2-texinfo-5.0.patch
@@ -0,0 +1,162 @@
+diff --git a/bfd/doc/bfd.texinfo b/bfd/doc/bfd.texinfo
+index 45ffa73..3aa3300 100644
+--- a/bfd/doc/bfd.texinfo
++++ b/bfd/doc/bfd.texinfo
+@@ -322,7 +324,7 @@ All of BFD lives in one directory.
+ @printindex cp
+
+ @tex
+-% I think something like @colophon should be in texinfo. In the
++% I think something like @@colophon should be in texinfo. In the
+ % meantime:
+ \long\def\colophon{\hbox to0pt{}\vfill
+ \centerline{The body of this manual is set in}
+@@ -333,7 +335,7 @@ All of BFD lives in one directory.
+ \centerline{{\sl\fontname\tensl\/}}
+ \centerline{are used for emphasis.}\vfill}
+ \page\colophon
+-% Blame: doc@cygnus.com, 28mar91.
++% Blame: doc@@cygnus.com, 28mar91.
+ @end tex
+
+ @bye
+diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi
+index 56a0510..fb1802b 100644
+--- a/binutils/doc/binutils.texi
++++ b/binutils/doc/binutils.texi
+@@ -148,18 +148,18 @@ in the section entitled ``GNU Free Documentation License''.
+ * objcopy:: Copy and translate object files
+ * objdump:: Display information from object files
+ * ranlib:: Generate index to archive contents
+-* readelf:: Display the contents of ELF format files
+ * size:: List section sizes and total size
+ * strings:: List printable strings from files
+ * strip:: Discard symbols
+-* elfedit:: Update the ELF header of ELF files
+ * c++filt:: Filter to demangle encoded C++ symbols
+ * cxxfilt: c++filt. MS-DOS name for c++filt
+ * addr2line:: Convert addresses to file and line
+ * nlmconv:: Converts object code into an NLM
+-* windres:: Manipulate Windows resources
+ * windmc:: Generator for Windows message resources
++* windres:: Manipulate Windows resources
+ * dlltool:: Create files needed to build and use DLLs
++* readelf:: Display the contents of ELF format files
++* elfedit:: Update the ELF header of ELF files
+ * Common Options:: Command-line options for all utilities
+ * Selecting the Target System:: How these utilities determine the target
+ * Reporting Bugs:: Reporting Bugs
+@@ -2907,7 +2907,7 @@ the Info entries for @file{binutils}.
+ @c man end
+ @end ignore
+
+-@node c++filt, addr2line, elfedit, Top
++@node c++filt, addr2line, strip, Top
+ @chapter c++filt
+
+ @kindex c++filt
+@@ -4384,7 +4384,7 @@ equivalent. At least one of the @option{--output-mach},
+
+ @table @env
+
+-@itemx --input-mach=@var{machine}
++@item --input-mach=@var{machine}
+ Set the matching input ELF machine type to @var{machine}. If
+ @option{--input-mach} isn't specified, it will match any ELF
+ machine types.
+@@ -4392,21 +4392,21 @@ machine types.
+ The supported ELF machine types are, @var{L1OM}, @var{K1OM} and
+ @var{x86-64}.
+
+-@itemx --output-mach=@var{machine}
++@item --output-mach=@var{machine}
+ Change the ELF machine type in the ELF header to @var{machine}. The
+ supported ELF machine types are the same as @option{--input-mach}.
+
+-@itemx --input-type=@var{type}
++@item --input-type=@var{type}
+ Set the matching input ELF file type to @var{type}. If
+ @option{--input-type} isn't specified, it will match any ELF file types.
+
+ The supported ELF file types are, @var{rel}, @var{exec} and @var{dyn}.
+
+-@itemx --output-type=@var{type}
++@item --output-type=@var{type}
+ Change the ELF file type in the ELF header to @var{type}. The
+ supported ELF types are the same as @option{--input-type}.
+
+-@itemx --input-osabi=@var{osabi}
++@item --input-osabi=@var{osabi}
+ Set the matching input ELF file OSABI to @var{osabi}. If
+ @option{--input-osabi} isn't specified, it will match any ELF OSABIs.
+
+@@ -4416,7 +4416,7 @@ The supported ELF OSABIs are, @var{none}, @var{HPUX}, @var{NetBSD},
+ @var{FreeBSD}, @var{TRU64}, @var{Modesto}, @var{OpenBSD}, @var{OpenVMS},
+ @var{NSK}, @var{AROS} and @var{FenixOS}.
+
+-@itemx --output-osabi=@var{osabi}
++@item --output-osabi=@var{osabi}
+ Change the ELF OSABI in the ELF header to @var{osabi}. The
+ supported ELF OSABI are the same as @option{--input-osabi}.
+
+diff --git a/ld/ld.texinfo b/ld/ld.texinfo
+index c7ae2a5..4777ad5 100644
+--- a/ld/ld.texinfo
++++ b/ld/ld.texinfo
+@@ -142,12 +144,12 @@ in the section entitled ``GNU Free Documentation License''.
+ @ifset ARM
+ * ARM:: ld and the ARM family
+ @end ifset
+-@ifset HPPA
+-* HPPA ELF32:: ld and HPPA 32-bit ELF
+-@end ifset
+ @ifset M68HC11
+ * M68HC11/68HC12:: ld and the Motorola 68HC11 and 68HC12 families
+ @end ifset
++@ifset HPPA
++* HPPA ELF32:: ld and HPPA 32-bit ELF
++@end ifset
+ @ifset M68K
+ * M68K:: ld and Motorola 68K family
+ @end ifset
+@@ -6012,6 +6014,9 @@ functionality are not listed.
+ @ifset I960
+ * i960:: @command{ld} and the Intel 960 family
+ @end ifset
++@ifset M68HC11
++* M68HC11/68HC12:: @code{ld} and the Motorola 68HC11 and 68HC12 families
++@end ifset
+ @ifset ARM
+ * ARM:: @command{ld} and the ARM family
+ @end ifset
+@@ -6027,9 +6032,6 @@ functionality are not listed.
+ @ifset MSP430
+ * MSP430:: @command{ld} and MSP430
+ @end ifset
+-@ifset M68HC11
+-* M68HC11/68HC12:: @code{ld} and the Motorola 68HC11 and 68HC12 families
+-@end ifset
+ @ifset POWERPC
+ * PowerPC ELF32:: @command{ld} and PowerPC 32-bit ELF Support
+ @end ifset
+@@ -7877,7 +7879,7 @@ If you have more than one @code{SECT} statement for the same
+ @printindex cp
+
+ @tex
+-% I think something like @colophon should be in texinfo. In the
++% I think something like @@colophon should be in texinfo. In the
+ % meantime:
+ \long\def\colophon{\hbox to0pt{}\vfill
+ \centerline{The body of this manual is set in}
+@@ -7888,7 +7890,7 @@ If you have more than one @code{SECT} statement for the same
+ \centerline{{\sl\fontname\tensl\/}}
+ \centerline{are used for emphasis.}\vfill}
+ \page\colophon
+-% Blame: doc@cygnus.com, 28mar91.
++% Blame: doc@@cygnus.com, 28mar91.
+ @end tex
+
+ @bye
+--
+1.7.1
+
diff --git a/community/avr-gcc/PKGBUILD b/community/avr-gcc/PKGBUILD
index 36ed19ef1..d7bca6f70 100644
--- a/community/avr-gcc/PKGBUILD
+++ b/community/avr-gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 77419 2012-10-09 18:03:26Z schuay $
+# $Id: PKGBUILD 88221 2013-04-14 18:17:00Z schuay $
# Maintainer: schuay <jakob.gruber@gmail.com>
# Contributor: Brad Fanella <bradfanella@archlinux.us>
# Contributor: Corrado Primier <bardo@aur.archlinux.org>
@@ -8,19 +8,20 @@
pkgname=avr-gcc
_pkgname=gcc
-pkgver=4.7.2
+pkgver=4.8.0
pkgrel=1
pkgdesc="The GNU AVR Compiler Collection"
arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'custom')
+license=('GPL' 'LGPL' 'FDL' 'custom')
url="http://gcc.gnu.org/"
-depends=('avr-binutils>=2.22-3' 'cloog' 'ppl' 'gcc-libs>=4.7.0' 'libmpc')
+depends=('avr-binutils>=2.23' 'cloog' 'ppl' 'gcc-libs>=4.8.0' 'libmpc')
+optdepends=('avr-libc: Standard C library for Atmel AVR development')
provides=("gcc-avr=$pkgver")
replaces=('gcc-avr')
-options=('!libtool' '!emptydirs' '!libtool' '!strip')
+options=('!libtool' '!emptydirs' '!strip')
source=(http://ftp.gnu.org/gnu/gcc/${_pkgname}-${pkgver}/gcc-${pkgver}.tar.bz2)
-_basedir=${srcdir}/${_pkgname}-${pkgver}
+_basedir=${_pkgname}-${pkgver}
build() {
# default CFLAGS lead to issues later on when configure
@@ -28,30 +29,52 @@ build() {
export CFLAGS="-O2 -pipe"
export CXXFLAGS="-O2 -pipe"
- cd ${_basedir}
+ cd ${srcdir}/${_basedir}
# Do not install libiberty
sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
+ # https://bugs.archlinux.org/task/34629
+ sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
+ sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" gcc/configure
+
echo ${pkgver} > gcc/BASE-VER
cd ${srcdir}
mkdir gcc-build && cd gcc-build
- ${_basedir}/configure \
- --prefix=/usr \
+ ${srcdir}/${_basedir}/configure \
+ --disable-cloog-version-check \
+ --disable-install-libiberty \
+ --disable-libssp \
+ --disable-libstdcxx-pch \
+ --disable-libunwind-exceptions \
+ --disable-nls \
+ --disable-werror \
+ --enable-__cxa_atexit \
+ --enable-checking=release \
+ --enable-clocale=gnu \
+ --enable-cloog-backend=isl \
+ --enable-gnu-unique-object \
+ --enable-gold \
+ --enable-languages=c,c++ \
+ --enable-ld=default \
+ --enable-linker-build-id \
+ --enable-lto \
+ --enable-plugin \
+ --enable-shared \
+ --infodir=/usr/share/info \
--libdir=/usr/lib \
--libexecdir=/usr/lib \
--mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --enable-languages=c,c++ \
- --disable-libssp \
- --disable-nls \
+ --prefix=/usr \
--target=avr \
--with-as=/usr/bin/avr-as \
- --with-ld=/usr/bin/avr-ld \
--with-gnu-as \
- --with-gnu-ld
+ --with-gnu-ld \
+ --with-ld=/usr/bin/avr-ld \
+ --with-plugin-ld=ld.gold \
+ --with-system-zlib
make
}
@@ -61,12 +84,16 @@ package() {
make -j1 DESTDIR=${pkgdir} install
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
+ # Strip debug symbols from libraries; without this, the package size balloons to ~500MB.
+ find ${pkgdir}/usr/lib -type f -name "*.a" \
+ -exec /usr/bin/avr-strip --strip-debug '{}' \;
+
+ # Install Runtime Library Exception
+ install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \
${pkgdir}/usr/share/licenses/${pkgname}/RUNTIME.LIBRARY.EXCEPTION
rm -rf ${pkgdir}/usr/share/man/man7
rm -rf ${pkgdir}/usr/share/info
}
-md5sums=('cc308a0891e778cfda7a151ab8a6e762')
+md5sums=('e6040024eb9e761c3bea348d1fa5abb0')
diff --git a/community/avr-gdb/PKGBUILD b/community/avr-gdb/PKGBUILD
index 367c160d1..29aaf49f7 100644
--- a/community/avr-gdb/PKGBUILD
+++ b/community/avr-gdb/PKGBUILD
@@ -7,34 +7,37 @@
pkgname=avr-gdb
_pkgname=gdb
-pkgver=7.4
-pkgrel=2
+pkgver=7.5.1
+pkgrel=1
pkgdesc="The GNU Debugger for AVR"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnu.org/software/gdb/"
license=('GPL3')
-depends=('python')
+depends=('python2')
options=('!libtool')
source=(http://ftp.gnu.org/gnu/gdb/${_pkgname}-${pkgver}.tar.bz2)
-md5sums=('95a9a8305fed4d30a30a6dc28ff9d060')
build() {
cd ${srcdir}/${_pkgname}-${pkgver}
unset LDFLAGS
export CFLAGS="-O2 -pipe"
+ export CPPFLAGS="-O2 -pipe"
export CXXFLAGS="$CFLAGS"
- ./configure --prefix=/usr \
- --target=avr \
+ ./configure \
--disable-nls \
--enable-languages=c,c++ \
--infodir=/usr/share/info \
--libdir=/usr/lib \
- --program-prefix=avr- \
--libexecdir=/usr/lib \
--mandir=/usr/share/man \
+ --prefix=/usr \
+ --program-prefix=avr- \
+ --target=avr \
+ --with-python=/usr/bin/python2 \
--with-system-readline
+
make
}
@@ -48,3 +51,5 @@ package() {
rm -rf ${pkgdir}/usr/share/gdb
rm -rf ${pkgdir}/usr/include/gdb
}
+
+md5sums=('3f48f468b24447cf24820054ff6e85b1')
diff --git a/community/ettercap/PKGBUILD b/community/ettercap/PKGBUILD
index a24c74cda..e8646e4d6 100644
--- a/community/ettercap/PKGBUILD
+++ b/community/ettercap/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 87630 2013-04-04 10:17:39Z jelle $
+# $Id: PKGBUILD 88226 2013-04-14 19:02:25Z jelle $
# Maintainer:
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgbase=ettercap
pkgname=('ettercap' 'ettercap-gtk')
pkgver=0.7.6
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
url="http://ettercap.github.com/ettercap/"
license=('GPL')
@@ -13,7 +13,9 @@ depends=('openssl' 'libpcap' 'pcre' 'libltdl' 'libnet')
makedepends=('ghostscript' 'cmake' 'libpcap' 'libltdl' 'libnet' 'gtk2')
options=('!libtool' '!makeflags' '!emptydirs')
source=("https://github.com/Ettercap/ettercap/archive/v$pkgver.tar.gz" "ettercap.desktop" "org.archlinux.pkexec.ettercap.policy")
-md5sums=('7c5f5e1fd4002afdfd13765ef92866e1')
+md5sums=('7c5f5e1fd4002afdfd13765ef92866e1'
+ '51ae9f08e37a0621b3caeedb8e4d47d7'
+ '473867a0ee6da9cfb048b3d332c3d71f')
build() {
cd "${srcdir}"
@@ -43,31 +45,29 @@ package_ettercap() {
package_ettercap-gtk() {
pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - GTK frontend"
- depends+=('gtk2')
+ depends+=('gtk2' 'polkit')
backup=('etc/ettercap/etter.conf')
conflicts=('ettercap')
provides=('ettercap')
-#install='ettercap-gtk.install'
+ optdepends=('polkit-gnome')
+ install='ettercap-gtk.install'
install -d $pkgdir/usr/share/polkit-1/actions/
cd "${srcdir}"/${pkgbase}-${pkgver}-gtk/build
make DESTDIR="${pkgdir}" install
-# install -Dm644 "${srcdir}/ettercap.desktop" "${pkgdir}/usr/share/applications/ettercap.desktop"
-# install -Dm644 "${srcdir}/${pkgbase}-${pkgver}-gtk/desktop/ettercap.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/ettercap.svg"
+ install -Dm644 "${srcdir}/ettercap.desktop" "${pkgdir}/usr/share/applications/ettercap.desktop"
+ install -Dm644 "${srcdir}/${pkgbase}-${pkgver}-gtk/desktop/ettercap.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/ettercap.svg"
# Install policy file
-# install -Dm644 "${srcdir}/org.archlinux.pkexec.ettercap.policy" "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.ettercap.policy"
+ install -Dm644 "${srcdir}/org.archlinux.pkexec.ettercap.policy" "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.ettercap.policy"
# We need rename the original script
-# mv "${pkgdir}/usr/bin/ettercap" "${pkgdir}/usr/bin/ettercap.elf"
+ mv "${pkgdir}/usr/bin/ettercap" "${pkgdir}/usr/bin/ettercap.elf"
# Install launcher script
-# echo '#!/bin/sh' > ${pkgdir}/usr/bin/ettercap
-#echo 'pkexec --disable-internal-agent "/usr/bin/ettercap.elf" "$@"' >> ${pkgdir}/usr/bin/ettercap
-# chmod 755 ${pkgdir}/usr/bin/ettercap
+ echo '#!/bin/sh' > ${pkgdir}/usr/bin/ettercap
+ echo 'pkexec --disable-internal-agent "/usr/bin/ettercap.elf" "$@"' >> ${pkgdir}/usr/bin/ettercap
+ chmod 755 ${pkgdir}/usr/bin/ettercap
}
-md5sums=('7c5f5e1fd4002afdfd13765ef92866e1'
- '21fe8aee8c7eb34bd5757a4de485ca06'
- 'd20a6137008edd3fae01757cb193b870')
diff --git a/community/ettercap/ettercap-gtk.install b/community/ettercap/ettercap-gtk.install
index 100a94efe..e8f6bed8f 100644
--- a/community/ettercap/ettercap-gtk.install
+++ b/community/ettercap/ettercap-gtk.install
@@ -1,14 +1,14 @@
post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- echo 'If you use a lightweight windowmanager, remember to run'
- echo '/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 to enable'
- echo 'graphical authentication, which may be needed for pkexec to work.'
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+ echo 'If you use a lightweight windowmanager, remember to run'
+ echo '/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 to enable'
+ echo 'graphical authentication, which may be needed for pkexec to work.'
}
post_upgrade() {
- post_install
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
}
post_remove() {
- post_install
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
}
diff --git a/community/ettercap/ettercap.desktop b/community/ettercap/ettercap.desktop
index 7ea54b7c7..71f8c8ce8 100644
--- a/community/ettercap/ettercap.desktop
+++ b/community/ettercap/ettercap.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Name=Ettercap
Comment=Nework sniffer/analyser
-Exec=ettercap
+Exec=ettercap -G
Icon=ettercap
Terminal=false
Type=Application
diff --git a/community/ettercap/org.archlinux.pkexec.ettercap.policy b/community/ettercap/org.archlinux.pkexec.ettercap.policy
index 101b11a0f..7908d7232 100644
--- a/community/ettercap/org.archlinux.pkexec.ettercap.policy
+++ b/community/ettercap/org.archlinux.pkexec.ettercap.policy
@@ -1,18 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE policyconfig PUBLIC
-"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
-"http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
<policyconfig>
-<action id="com.archlinux.pkexec.ettercap">
-<message gettext-domain="ettercap"> Authentication is required to run the Ettercap</message>
-<icon_name>ettercap</icon_name>
-<defaults>
-<allow_any > auth_admin < /allow_any>
-<allow_inactive>auth_admin</allow_inactive>
-<allow_active>auth_admin</allow_active>
-</defaults>
-<annotate key="org.freedesktop.policykit.exec.path">/usr/bin/ettercap.elf</annotate>
-<annotate key="org.freedesktop.policykit.exec.allow_gui">true< /annotate>
-</action>
+ <action id="org.archlinux.pkexec.ettercap">
+ <message>Authentication is required to run Ettercap</message>
+ <icon_name>ettercap</icon_name>
+ <defaults>
+ <allow_any>auth_admin</allow_any>
+ <allow_inactive>auth_admin</allow_inactive>
+ <allow_active>auth_admin</allow_active>
+ </defaults>
+ <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/ettercap.elf</annotate>
+ <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+ </action>
+
</policyconfig>
diff --git a/community/mayavi/PKGBUILD b/community/mayavi/PKGBUILD
index 888251cd7..a4498094c 100644
--- a/community/mayavi/PKGBUILD
+++ b/community/mayavi/PKGBUILD
@@ -1,13 +1,12 @@
-# $Id: PKGBUILD 76178 2012-09-12 16:35:27Z aginiewicz $
+# $Id: PKGBUILD 88238 2013-04-14 20:02:10Z aginiewicz $
# Maintainer: Andrzej Giniewicz <gginiu@gmail.com>
pkgname=mayavi
-pkgver=4.2.0
-_githubtag=a1e562a
-pkgrel=4
+pkgver=4.3.0
+pkgrel=1
pkgdesc="A 3-dimensional visualizer of scientific data"
arch=('i686' 'x86_64')
-url="http://code.enthought.com/projects/mayavi/"
+url="https://github.com/enthought/mayavi"
license=('BSD')
depends=('ipython2' 'vtk' 'python2-envisage' 'wxpython')
makedepends=('python2-distribute' 'python2-sphinx' 'xorg-server-xvfb' 'twisted')
@@ -15,16 +14,11 @@ replaces=('python2-mayavi')
provides=('python2-mayavi')
options=(!emptydirs)
-source=("$pkgname-$pkgver.tar.gz::https://github.com/enthought/mayavi/tarball/${pkgver}"
- vtk-5.10.patch)
-md5sums=('b46fb048176002738de64eed8d2b447a'
- '01b8375392b5d3f587e81ba388a8089f')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/enthought/mayavi/archive/${pkgver}.tar.gz")
+md5sums=('7708d85a77c427c8dfbeb914630d31be')
build() {
- cd "$srcdir"/enthought-mayavi-${_githubtag}
-
- # Add compatibility for vtk 5.10 (FS#31498)
- patch -p1 < ../vtk-5.10.patch
+ cd "$srcdir"/mayavi-$pkgver
# Use python2-sphinx provided sphinx-build2
sed -i -e 's/sphinx-build/sphinx-build2/' docs/Makefile*
@@ -42,8 +36,6 @@ build() {
build/lib.linux-$CARCH-2.7/mayavi/preferences/preferences.ini
ln -s "$srcdir"/enthought-mayavi-${_githubtag}/tvtk/plugins/scene/preferences.ini \
build/lib.linux-$CARCH-2.7/tvtk/plugins/scene/preferences.ini
- ln -s "$srcdir"/enthought-mayavi-${_githubtag}/mayavi/core/lut \
- build/lib.linux-$CARCH-2.7/mayavi/core/lut
# now this is ugly, but docs do not build without X. We setup X according to:
# http://docs.enthought.com/mayavi/mayavi/tips.html#rendering-using-the-virtual-framebuffer
@@ -58,11 +50,10 @@ build() {
rm build/lib.linux-$CARCH-2.7/tvtk/tvtk_classes.zip
rm build/lib.linux-$CARCH-2.7/mayavi/preferences/preferences.ini
rm build/lib.linux-$CARCH-2.7/tvtk/plugins/scene/preferences.ini
- rm build/lib.linux-$CARCH-2.7/mayavi/core/lut
}
package() {
- cd "$srcdir"/enthought-mayavi-${_githubtag}
+ cd "$srcdir"/mayavi-$pkgver
python2 setup.py install --root="$pkgdir"/ --optimize=1
diff --git a/community/primus/PKGBUILD b/community/primus/PKGBUILD
index 85408e472..a705d38e0 100644
--- a/community/primus/PKGBUILD
+++ b/community/primus/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Alexander Monakov <amonakov@gmail.com>
pkgname=primus
-pkgver=20130404
+pkgver=20130414
pkgrel=1
pkgdesc="Faster OpenGL offloading for Bumblebee"
arch=('i686' 'x86_64')
diff --git a/community/python2-traits/PKGBUILD b/community/python2-traits/PKGBUILD
index 842eb0e8d..1ae9671e7 100644
--- a/community/python2-traits/PKGBUILD
+++ b/community/python2-traits/PKGBUILD
@@ -1,29 +1,28 @@
-# $Id: PKGBUILD 75625 2012-08-27 16:55:19Z aginiewicz $
+# $Id: PKGBUILD 88228 2013-04-14 19:37:35Z aginiewicz $
# Maintainer: Andrzej Giniewicz <gginiu@gmail.com>
pkgname=python2-traits
-pkgver=4.2.0
-_githubtag=0afc79d
-pkgrel=2
+pkgver=4.3.0
+pkgrel=1
pkgdesc="Explicitly typed attributes for Python"
arch=('i686' 'x86_64' 'mips64el')
-url="http://code.enthought.com/projects/traits/"
+url="https://github.com/enthought/traits"
license=('BSD')
depends=('python2-numpy')
makedepends=('python2-distribute')
options=(!emptydirs)
-source=("$pkgname-$pkgver.tar.gz::https://github.com/enthought/traits/tarball/${pkgver}")
-md5sums=('835c83c320ed1109ca05fa4ae4556828')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/enthought/traits/archive/${pkgver}.tar.gz")
+md5sums=('f78c15c44e0f965cc2ab799806a80388')
build() {
- cd "$srcdir"/enthought-traits-${_githubtag}
+ cd "$srcdir"/traits-$pkgver
python2 setup.py build
}
package() {
- cd "$srcdir"/enthought-traits-${_githubtag}
+ cd "$srcdir"/traits-$pkgver
python2 setup.py install --root="$pkgdir"/ --optimize=1
diff --git a/community/task/PKGBUILD b/community/task/PKGBUILD
index 2798e169b..ab6b31024 100644
--- a/community/task/PKGBUILD
+++ b/community/task/PKGBUILD
@@ -5,17 +5,17 @@
# Contributor: coolkehon <coolkehon@gmail.com>
pkgname=task
-pkgver=2.1.2
-pkgrel=4
+pkgver=2.2.0
+pkgrel=1
pkgdesc="A command-line todo list manager"
arch=('i686' 'x86_64' 'mips64el')
url="http://taskwarrior.org/projects/show/taskwarrior/"
license=('MIT')
-depends=('lua' 'util-linux')
-makedepends=('cmake' 'lua')
+depends=('util-linux')
+makedepends=('cmake')
optdepends=('bash-completion: for bash completion' 'python: for python export addon' 'ruby: for ruby export addon' 'perl: for perl export addon' 'perl-json: for perl export addon')
source=(http://www.taskwarrior.org/download/$pkgname-$pkgver.tar.gz)
-sha256sums=('cf5171b54b6d2d2dcd9c559f437cf8a2cb3836c7631edf96a16efbf8b4383e36')
+sha256sums=('39e25dd285e6bc8474337a5868cb2ec55675978fa1f08c802e6da58b4181ee14')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD
index 21e7e57d9..94ac5ec54 100644
--- a/core/kmod/PKGBUILD
+++ b/core/kmod/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 173025 2012-12-08 19:52:26Z dreisner $
+# $Id: PKGBUILD 182754 2013-04-14 16:44:17Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
pkgname=kmod
-pkgver=12
+pkgver=13
pkgrel=1
pkgdesc="Linux kernel module handling"
arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ conflicts=('module-init-tools')
replaces=('module-init-tools')
source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz"
"depmod-search.conf")
-md5sums=('3d63b146c8ee5a04dfbef4be97f8226b'
+md5sums=('d5aba43b9370cd52f3cb35e82a1aa595'
'dd62cbf62bd8f212f51ef8c43bec9a77')
build() {
diff --git a/extra/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD
index 1bef742f9..4b376fdc5 100644
--- a/extra/net-snmp/PKGBUILD
+++ b/extra/net-snmp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 179640 2013-03-08 23:40:45Z foutrelis $
+# $Id: PKGBUILD 182744 2013-04-14 04:22:21Z eric $
# Maintainer:
# Contributor: Dale Blount <dale@archlinux.org>
pkgname=net-snmp
pkgver=5.7.2
-pkgrel=3
+pkgrel=4
pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.net-snmp.org/"
@@ -14,25 +14,23 @@ makedepends=('python2-distribute')
optdepends=('perl-term-readkey: for snmpcheck application'
'perl-tk: for snmpcheck and tkmib applications'
'python2: for the python modules')
-provides=('ucd-snmp')
-backup=('etc/conf.d/snmpd')
-options=('!libtool' '!emptydirs')
+options=('!libtool' '!emptydirs' '!makeflags')
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
- snmpd.confd snmpd.rc snmpd.service libnl32.patch)
+ snmpd.service libnl32.patch)
sha1sums=('c493027907f32400648244d81117a126aecd27ee'
- '25ee4b2e7b5a1b91122d06e82d41ef5bb5359d6d'
- 'cf811da9e57bbca34d8e2a3c358bb3bfc0c2b33b'
- '90600c0141eed10d6e3ca3ccc97ad8dda15c2112'
- 'f59ddc049c1c689f04e68c3c7cd8b8e301df3158'
+ 'SKIP'
+ '2ad00f89ecb8ec97adfbae7adfbfa3499319e5d7'
'74a9848b95f63378eb1753fc309d2b74de5afb0f')
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- # http://sourceforge.net/tracker/index.php?func=detail&aid=3250304&group_id=12694&atid=112694
+prepare() {
+ cd ${pkgname}-${pkgver}
+# http://sourceforge.net/tracker/index.php?func=detail&aid=3250304&group_id=12694&atid=112694
patch -Np1 -i "$srcdir/libnl32.patch"
autoreconf -f -i
+}
+build() {
+ cd ${pkgname}-${pkgver}
PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
@@ -50,11 +48,9 @@ build() {
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
sed -i -e "s:install --basedir=\$\$dir:install --basedir=\$\$dir --root=${pkgdir}:" Makefile
make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install
- install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd"
- install -D -m644 "${srcdir}/snmpd.confd" "${pkgdir}/etc/conf.d/snmpd"
install -D -m644 "${srcdir}/snmpd.service" "${pkgdir}/usr/lib/systemd/system/snmpd.service"
install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
diff --git a/extra/net-snmp/snmpd.confd b/extra/net-snmp/snmpd.confd
deleted file mode 100644
index 926b09bbf..000000000
--- a/extra/net-snmp/snmpd.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Parameters to be passed to snmpd
-#
-SNMPD_ARGS=""
-
diff --git a/extra/net-snmp/snmpd.rc b/extra/net-snmp/snmpd.rc
deleted file mode 100644
index b00c09f4f..000000000
--- a/extra/net-snmp/snmpd.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/snmpd
-
-PID=`pidof -o %PPID /usr/sbin/snmpd`
-case "$1" in
- start)
- stat_busy "Starting Net-SNMP"
- [ -z "$PID" ] && /usr/sbin/snmpd $SNMPD_ARGS
- if [ $? -gt 0 ]; then
- stat_fail
- else
- echo $PID > /var/run/snmpd.pid
- add_daemon snmpd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Net-SNMP"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm /var/run/snmpd.pid
- rm_daemon snmpd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 2
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/net-snmp/snmpd.service b/extra/net-snmp/snmpd.service
index 111a8d6a9..3e5dbc534 100644
--- a/extra/net-snmp/snmpd.service
+++ b/extra/net-snmp/snmpd.service
@@ -4,7 +4,8 @@ After=syslog.target network.target
[Service]
Type=forking
-ExecStart=/usr/sbin/snmpd
+PIDFile=/run/snmpd.pid
+ExecStart=/usr/sbin/snmpd -p /run/snmpd.pid
ExecReload=/bin/kill -HUP $MAINPID
[Install]