summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/binutils/PKGBUILD10
-rw-r--r--core/dbus-core/PKGBUILD38
-rw-r--r--core/gcc/PKGBUILD15
-rw-r--r--core/gcc/gcc-4.7.1-libgo-mksysinfo.patch15
-rw-r--r--core/glibc/PKGBUILD309
-rw-r--r--core/glibc/glibc-2.15-revert-c5a0802a.patch11
-rw-r--r--core/grep/PKGBUILD8
-rw-r--r--core/libusb-compat/PKGBUILD15
-rw-r--r--core/libusb-compat/libusb-0.1-libusbx.patch17
-rw-r--r--core/lvm2/PKGBUILD7
-rw-r--r--core/mpfr/PKGBUILD18
-rw-r--r--core/shadow/PKGBUILD67
-rw-r--r--core/util-linux/PKGBUILD28
-rw-r--r--core/util-linux/pam-common6
-rw-r--r--core/util-linux/pam-login7
15 files changed, 189 insertions, 382 deletions
diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD
index 5f78894d3..f3988047e 100644
--- a/core/binutils/PKGBUILD
+++ b/core/binutils/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 158099 2012-05-02 22:27:06Z allan $
+# $Id: PKGBUILD 163009 2012-07-05 13:48:25Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
pkgname=binutils
pkgver=2.22
-pkgrel=7
+pkgrel=8
_date=20120323
pkgdesc="A set of programs to assemble and manipulate binary and object files"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnu.org/software/binutils/"
license=('GPL')
groups=('base-devel')
-depends=('glibc>=2.15' 'zlib')
+depends=('glibc>=2.16' 'zlib')
checkdepends=('dejagnu')
options=('!libtool' '!distcc' '!ccache')
install=binutils.install
@@ -67,7 +67,9 @@ check() {
cd ${srcdir}/binutils-build
# do not abort on errors - manually check log files
- make -k -j1 check || true
+ # gold testsuite does not build with _FORTIFY_SOURCE (due to -O0 -Werror)
+ make CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/}" \
+ CXXFLAGS="${CXXFLAGS/-D_FORTIFY_SOURCE=2/}" -k check || true
}
package() {
diff --git a/core/dbus-core/PKGBUILD b/core/dbus-core/PKGBUILD
index 286deb9b4..2f2b54c68 100644
--- a/core/dbus-core/PKGBUILD
+++ b/core/dbus-core/PKGBUILD
@@ -1,31 +1,31 @@
-# $Id: PKGBUILD 162424 2012-06-27 01:43:40Z dreisner $
+# $Id: PKGBUILD 163027 2012-07-06 01:27:03Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Link Dupont <link@subpop.net>
#
pkgname=dbus-core
-pkgver=1.6.0
-pkgrel=5
+pkgver=1.6.2
+pkgrel=2
pkgdesc="Freedesktop.org message bus system"
url="http://www.freedesktop.org/Software/dbus"
arch=(i686 x86_64 'mips64el')
license=('GPL' 'custom')
-depends=('expat>=2.0.1' 'coreutils' 'filesystem' 'libsystemd' 'shadow' 'systemd-tools') # shadow for install scriptlet FS#29341
+depends=('expat' 'coreutils' 'filesystem' 'libsystemd' 'shadow' 'systemd-tools') # shadow for install scriptlet FS#29341
makedepends=('libx11')
-conflicts=('dbus<1.2.3-2')
options=(!libtool)
install=dbus.install
-source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz{,.asc}
+source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc}
dbus)
-md5sums=('16dcae2dd0c76e398381601ac9acdec4'
- '0ebde9920bde83fe26ce32351a7d8954'
+md5sums=('7fbf877ed6ff7da6df90f07158373829'
+ '2cd74b6efca77e4e3aa2b7ccde770668'
'f0364f3f5dc5f653bb05d39aa36e3264')
build() {
- cd "${srcdir}/dbus-${pkgver}"
+ cd dbus-$pkgver
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
--with-system-pid-file=/run/dbus/pid \
--with-system-socket=/run/dbus/system_bus_socket \
+ --with-console-auth-dir=/run/console/ \
--enable-inotify --disable-dnotify \
--disable-verbose-mode --disable-static \
--disable-tests --disable-asserts \
@@ -35,19 +35,19 @@ build() {
}
package(){
- cd "${srcdir}/dbus-${pkgver}"
- make DESTDIR="${pkgdir}" install
+ cd dbus-$pkgver
+ make DESTDIR="$pkgdir" install
- rm -f "${pkgdir}/usr/bin/dbus-launch"
- rm -f "${pkgdir}/usr/share/man/man1/dbus-launch.1"
- rm -rf "${pkgdir}/var/run"
+ rm -f "$pkgdir/usr/bin/dbus-launch"
+ rm -f "$pkgdir/usr/share/man/man1/dbus-launch.1"
+ rm -rf "$pkgdir/var/run"
- install -m755 -d "${pkgdir}/etc/rc.d"
- install -m755 "${srcdir}/dbus" "${pkgdir}/etc/rc.d/"
+ install -m755 -d "$pkgdir/etc/rc.d"
+ install -m755 ../dbus "$pkgdir/etc/rc.d/"
#Fix configuration file
- sed -i -e 's|<user>81</user>|<user>dbus</user>|' "${pkgdir}/etc/dbus-1/system.conf"
+ sed -i -e 's|<user>81</user>|<user>dbus</user>|' "$pkgdir/etc/dbus-1/system.conf"
- install -dm755 "${pkgdir}/usr/share/licenses/dbus-core"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus-core/"
+ install -dm755 "$pkgdir/usr/share/licenses/dbus-core"
+ install -m644 COPYING "$pkgdir/usr/share/licenses/dbus-core/"
}
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index 0b6c541a3..0f052815b 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 162898 2012-07-03 10:44:15Z allan $
+# $Id: PKGBUILD 163010 2012-07-05 13:48:46Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -10,7 +10,7 @@ else
pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc')
fi
pkgver=4.7.1
-pkgrel=3
+pkgrel=4
#_snapshot=4.7-20120505
_libstdcppmanver=20120605 # Note: check source directory name when updating this
pkgdesc="The GNU Compiler Collection"
@@ -30,13 +30,15 @@ source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
gcc_pure64.patch
gcc_mips64el_lib.patch
gcc-4.7.1-libada-pic.patch
- gcc-4.7.1-libgo-write.patch)
+ gcc-4.7.1-libgo-write.patch
+ gcc-4.7.1-libgo-mksysinfo.patch)
md5sums=('933e6f15f51c031060af64a9e14149ff'
'767c62f9a047c4434f2345decf1d0819'
'ced48436c1b3c981d721a829f1094de1'
'474b8f5a7dee6ddd96b95a7240bfb961'
'2acbc9d35cc9d72329dc71d6b1f162ef'
- 'df82dd175ac566c8a6d46b11ac21f14c')
+ 'df82dd175ac566c8a6d46b11ac21f14c'
+ '8e847244dba042d0aa3297713edaf70c')
if [ -n "${_snapshot}" ]; then
_basedir="${srcdir}/gcc-${_snapshot}"
@@ -65,6 +67,9 @@ build() {
# bug to file...
patch -p1 -i ${srcdir}/gcc-4.7.1-libada-pic.patch
+ # http://gcc.gnu.org/ml/gcc-patches/2012-06/msg01946.html
+ patch -p0 -i ${srcdir}/gcc-4.7.1-libgo-mksysinfo.patch
+
echo ${pkgver} > gcc/BASE-VER
cd ${srcdir}
@@ -129,7 +134,7 @@ package_gcc-libs()
{
pkgdesc="Runtime libraries shipped by GCC"
groups=('base')
- depends=('glibc>=2.15')
+ depends=('glibc>=2.16')
install=gcc-libs.install
cd gcc-build
diff --git a/core/gcc/gcc-4.7.1-libgo-mksysinfo.patch b/core/gcc/gcc-4.7.1-libgo-mksysinfo.patch
new file mode 100644
index 000000000..427efe8a6
--- /dev/null
+++ b/core/gcc/gcc-4.7.1-libgo-mksysinfo.patch
@@ -0,0 +1,15 @@
+--- libgo/mksysinfo.sh 2012-06-29 14:23:30.684708901 +0200
++++ libgo/mksysinfo.sh 2012-06-29 14:23:20.782761973 +0200
+@@ -522,10 +522,10 @@ grep '^const _DT_' gen-sysinfo.go |
+ # The rusage struct.
+ rusage=`grep '^type _rusage struct' gen-sysinfo.go`
+ if test "$rusage" != ""; then
+- rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'`
+- rusage=`echo $rusage | sed -e 's/^ *//'`
+ # Remove anonymous unions from GNU/Linux <bits/resource.h>.
+ rusage=`echo $rusage | sed -e 's/Godump_[0-9]* struct {\([^}]*\)};/\1/g'`
++ rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'`
++ rusage=`echo $rusage | sed -e 's/^ *//'`
+ nrusage=
+ while test -n "$rusage"; do
+ field=`echo $rusage | sed -e 's/^\([^;]*\);.*$/\1/'`
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index 403c758be..19fd64301 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -1,13 +1,12 @@
-# $Id: PKGBUILD 162151 2012-06-22 12:55:07Z dreisner $
+# $Id: PKGBUILD 163008 2012-07-05 13:48:19Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
# NOTE: valgrind requires rebuilt with each major glibc version
pkgname=glibc
-pkgver=2.15
-pkgrel=12
-_glibcdate=20111227
+pkgver=2.16.0
+pkgrel=1
_glibcportsver=2.15
_glibcportsdate=20120127
pkgdesc="GNU C Library"
@@ -15,96 +14,22 @@ arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnu.org/software/libc"
license=('GPL' 'LGPL')
groups=('base')
-depends=('linux-api-headers>=3.3' 'tzdata')
-makedepends=('gcc>=4.6')
+depends=('linux-api-headers>=3.4' 'tzdata')
+makedepends=('gcc>=4.7')
backup=(etc/gai.conf
etc/locale.gen
etc/nscd.conf)
options=('!strip')
install=glibc.install
-source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.xz
+source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
http://repo.parabolagnulinux.org/other/glibc-ports-${_glibcportsver}_${_glibcportsdate}.tar.xz
- glibc-2.15-do-not-install-timezone-files.patch
- glibc-2.15-do-not-install-timezone-files-2.patch
- glibc-__i686.patch
- glibc-2.14-libdl-crash.patch
- glibc-2.14-reexport-rpc-interface.patch
- glibc-2.14-reinstall-nis-rpc-headers.patch
glibc-2.15-fix-res_query-assert.patch
- glibc-2.15-regex.patch
- glibc-2.15-lddebug-scopes.patch
glibc-2.15-revert-c5a0802a.patch
- glibc-2.15-scanf.patch
- glibc-2.15-ifunc.patch
- glibc-2.15-avx.patch
- glibc-2.15-strcasecmp-disable-avx.patch
- glibc-2.15-gb18030.patch.gz
- glibc-2.15-revert-netlink-cache.patch
- glibc-2.15-arena.patch
- glibc-2.15-negative-result-cache.patch
- glibc-2.15-multiarch-x86-strcmp.patch
- glibc-2.15-vdso.patch
- glibc-2.15-feraiseexcept-plt.patch
- glibc-2.15-vfprintf-nargs.patch
- glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
- glibc-2.15-fmtmsg-locking.patch
- glibc-2.15-non-signalling-comparisons.patch
- glibc-2.15-rintf-rounding.patch
- glibc-2.15-nearbyintf-rounding.patch
- glibc-2.15-confstr-local-buffer-extent.patch
- glibc-2.15-testsuite.patch
nscd.rcd
nscd.service
nscd.tmpfiles
locale.gen.txt
locale-gen)
-md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
- '935995663b89924a98d20a636045949a'
- '7ef69c530a15106de93e4de2df2d393e'
- 'b6c619e5cf91829a15ce34dccef676d5'
- 'addfddd648a4bf832eb126aba944ebae'
- '6970bcfeb3bf88913436d5112d16f588'
- 'c5de2a946215d647c8af5432ec4b0da0'
- '55febbb72139ac7b65757df085024b83'
- '31f415b41197d85d3bbee3d1eecd06a3'
- 'b3526cbd5e29773560dba725db99af5a'
- '3c219ddfb619b6df903cac4cc42c611d'
- '7ae3e426251ae33e73dbad71f9c91378'
- 'f0782ddbf38e0b30ec6b85348816046f'
- '3d844b53b2dbb7c996e39c7ad932f55d'
- '41ae047ac88e8f6f547c70b0a0bc3b72'
- 'fccb89f6628f59752278e125c35941f8'
- '001a4044ac3d59aca6ee144eaca57ab2'
- '94b61302a7ca6c5764d013dc7738fcfe'
- 'a9ffadcfd2d357f91fee0b861fd4a7c6'
- '2c46b8e294de24c531f2253ff69aeef3'
- '7a2998a04ebfcf8bf820540f490ce714'
- '0d77d20fa7fe2f87ad945cb9edb4d91d'
- 'bfdefac3d705f41fbf84b1de1dc945af'
- '3443e89c1e98089cd6c3e3c23f0c3d85'
- '340deaa582a95ddde86edb624c3bfea0'
- '6bbac50e6ff82187654e6a0a7bd849e7'
- 'c483504cf404ed0b44480af627813a97'
- '1419d61fd1dbc6cdc48bb59da86fa66f'
- '7ff501435078b1a2622124fbeaafc921'
- '8d1023a51e0932681b46440d5f8551ee'
- '6962c3fa29306bfbf6f0d22b19cb825d'
- '589d79041aa767a5179eaa4e2737dd3f'
- 'ad8a9af15ab7eeaa23dc7ee85024af9f'
- 'bccbe5619e75cf1d97312ec3681c605c'
- '07ac979b6ab5eeb778d55f041529d623'
- '476e9113489f93b348b21e144b6a8fcf')
-
-
-mksource() {
- git clone http://sourceware.org/git/glibc.git
- pushd glibc
- #git checkout -b glibc-2.15-arch origin/release/2.15/master
- git checkout -b glibc-${pkgver}-arch origin/master
- popd
- tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/*
- mksource-ports
-}
mksource-ports() {
git clone http://sourceware.org/git/glibc-ports.git
@@ -114,137 +39,23 @@ mksource-ports() {
tar -cvJf glibc-ports-${_glibcportsver}_${_glibcportsdate}.tar.xz glibc-ports/*
}
-
build() {
- cd ${srcdir}/glibc
-
- # timezone data is in separate package (tzdata)
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=482ff4da
- patch -p1 -i ${srcdir}/glibc-2.15-do-not-install-timezone-files.patch
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=a458e7fe
- patch -p1 -i ${srcdir}/glibc-2.15-do-not-install-timezone-files-2.patch
-
- # undefine __i686
- # http://sourceware.org/glibc/wiki/Release/2.15#Build_Failures
- patch -p1 -i ${srcdir}/glibc-__i686.patch
-
- # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (fedora branch)
- # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
- patch -p1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
-
- # re-export RPC interface until libtirpc is ready as a replacement
- # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (fedora branch)
- patch -p1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch
- # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (fedora branch)
- patch -p1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch
+ cd ${srcdir}/${pkgname}-${pkgver}
# fix res_query assertion
# http://sourceware.org/bugzilla/show_bug.cgi?id=13013
patch -p1 -i ${srcdir}/glibc-2.15-fix-res_query-assert.patch
- # fix up regcomp/regexec
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=2ba92745
- patch -p1 -i ${srcdir}/glibc-2.15-regex.patch
-
- # propriety nvidia crash - https://bugzilla.redhat.com/show_bug.cgi?id=737223
- # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=0c95ab64 (fedora branch)
- patch -p1 -i ${srcdir}/glibc-2.15-lddebug-scopes.patch
-
# revert commit c5a0802a - causes various hangs
- # https://bugzilla.redhat.com/show_bug.cgi?id=769421
- # Note: fedora may have actual fix (not submitted upstream yet...)
- # http://pkgs.fedoraproject.org/gitweb/?p=glibc.git;a=blob_plain;f=glibc-rh552960-2.patch
+ # https://bugzilla.redhat.com/show_bug.cgi?id=552960
patch -p1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch
- # fix realloc usage in vfscanf
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=20b38e03
- patch -p1 -i ${srcdir}/glibc-2.15-scanf.patch
-
- # fix ifunc relocations
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=6ee65ed6
- patch -p1 -i ${srcdir}/glibc-2.15-ifunc.patch
-
- # fix AVX detection
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=afc5ed09
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=08cf777f
- patch -p1 -i ${srcdir}/glibc-2.15-avx.patch
- # and "fix" strcasecmp
- patch -p1 -i ${srcdir}/glibc-2.15-strcasecmp-disable-avx.patch
-
- # fix GB18030 charmap
- # http://sourceware.org/bugzilla/show_bug.cgi?id=11837
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=2a57bd79 (fedora branch)
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=3d828a61 (fedora branch)
- patch -p1 -i ${srcdir}/glibc-2.15-gb18030.patch
-
- # fix crash in __nscd_get_mapping if nscd not running
- # http://sourceware.org/bugzilla/show_bug.cgi?id=13594 (potential fix in comment)
- # reverts commit 3a2c0242 and other necessary following changes...
- patch -p1 -i ${srcdir}/glibc-2.15-revert-netlink-cache.patch
-
- # handle ARENA_TEST correctly
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=41b81892
- patch -p1 -i ${srcdir}/glibc-2.15-arena.patch
-
- # Do not cache negative results in nscd if these are transient
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=3e1aa84e
- patch -p1 -i ${srcdir}/glibc-2.15-negative-result-cache.patch
-
- # strcasecmp_l, strncasecmp_l act as strcmp for multiarch x86
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=0bab47b6
- patch -p1 -i ${srcdir}/glibc-2.15-multiarch-x86-strcmp.patch
-
- # always set l_used for vDSO.
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=1f393a11
- patch -p1 -i ${srcdir}/glibc-2.15-vdso.patch
-
- # fix x86 PLT slot usage for feraiseexcept
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=7c35ffed
- patch -p1 -i ${srcdir}/glibc-2.15-feraiseexcept-plt.patch
-
- # vfprintf nargs overflow - CVE-2012-0864
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=7c1f4834
- patch -p1 -i ${srcdir}/glibc-2.15-vfprintf-nargs.patch
-
- # avoid out ouf bounds read in __libc_res_nquerydomain
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=8fdceb2e
- patch -p1 -i ${srcdir}/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
-
- # make fmtmsg function thread-safe
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=7724defc
- patch -p1 -i ${srcdir}/glibc-2.15-fmtmsg-locking.patch
-
- # use non-signaling floating-point comparisons in math functions
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=92221550
- patch -p1 -i ${srcdir}/glibc-2.15-non-signalling-comparisons.patch
-
- # fix rintf rounding.
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=fe45ce09
- patch -p1 -i ${srcdir}/glibc-2.15-rintf-rounding.patch
-
- # fix nearbyintf rounding
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=6cbeae47
- patch -p1 -i ${srcdir}/glibc-2.15-nearbyintf-rounding.patch
-
if [ "${CARCH}" = "mips64el" ]; then
ln -s ../glibc-ports ports
# Fix typo making util-linux build fail.
sed -i "s/_MIPS_SIM_ABIN32/_MIPS_SIM_NABI32/" ports/sysdeps/unix/sysv/linux/mips/Makefile
fi
-
- # fix varaible scope issue in confstr
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=ac4c54f0
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=d6a403f9
- patch -p1 -i ${srcdir}/glibc-2.15-confstr-local-buffer-extent.patch
-
- # fix testsuite failures with --as-needed
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=d4c2917f
- patch -p1 -i ${srcdir}/glibc-2.15-testsuite.patch
-
- install -dm755 ${pkgdir}/etc
- touch ${pkgdir}/etc/ld.so.conf
-
cd ${srcdir}
mkdir glibc-build
cd glibc-build
@@ -264,12 +75,14 @@ build() {
CFLAGS=${CFLAGS/-fstack-protector/}
CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
- ${srcdir}/glibc/configure --prefix=/usr \
+ ${srcdir}/${pkgname}-${pkgver}/configure --prefix=/usr \
--libdir=/usr/lib --libexecdir=/usr/lib \
--with-headers=/usr/include \
--enable-add-ons=nptl,libidn$extra_addons \
+ --enable-obsolete-rpc \
--enable-kernel=2.6.32 \
--enable-bind-now --disable-profile \
+ --enable-stackguard-randomization \
--enable-multi-arch
# build libraries with hardening disabled
@@ -293,39 +106,37 @@ check() {
package() {
cd ${srcdir}/glibc-build
+
+ install -dm755 ${pkgdir}/etc
+ touch ${pkgdir}/etc/ld.so.conf
+
make install_root=${pkgdir} install
rm -f ${pkgdir}/etc/ld.so.{cache,conf}
install -dm755 ${pkgdir}/{etc/rc.d,usr/{sbin,lib/{,locale,systemd/system,tmpfiles.d}}}
- install -m644 ${srcdir}/glibc/nscd/nscd.conf ${pkgdir}/etc/nscd.conf
+ install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.conf ${pkgdir}/etc/nscd.conf
sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf
install -m755 ${srcdir}/nscd.rcd ${pkgdir}/etc/rc.d/nscd
install -m644 ${srcdir}/nscd.service ${pkgdir}/usr/lib/systemd/system
install -m644 ${srcdir}/nscd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/nscd.conf
- install -m644 ${srcdir}/glibc/posix/gai.conf ${pkgdir}/etc/gai.conf
+ install -m644 ${srcdir}/${pkgname}-${pkgver}/posix/gai.conf ${pkgdir}/etc/gai.conf
install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin
# create /etc/locale.gen
install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen
- sed -i "s|/| |g" ${srcdir}/glibc/localedata/SUPPORTED
- sed -i 's|\\| |g' ${srcdir}/glibc/localedata/SUPPORTED
- sed -i "s|SUPPORTED-LOCALES=||" ${srcdir}/glibc/localedata/SUPPORTED
- cat ${srcdir}/glibc/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen
- sed -i "s|^|#|g" ${pkgdir}/etc/locale.gen
+ sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \
+ ${srcdir}/glibc-2.16.0/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen
if [[ ${CARCH} = "x86_64" ]]; then
- # fix for the linker
+ # fix paths and compliance with binary blobs...
sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd
- # Comply with multilib binaries, they look for the linker in /lib64
- mkdir ${pkgdir}/lib64
- cd ${pkgdir}/lib64
- ln -v -s ../lib/ld* .
+ ln -s /lib ${pkgdir}/lib64
fi
-
+
# Do not strip the following files for improved debugging support
# ("improved" as in not breaking gdb and valgrind...):
# ld-${pkgver}.so
@@ -343,79 +154,9 @@ package() {
strip $STRIP_STATIC usr/lib/*.a
- strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libcidn,libcrypt}-${pkgver}.so \
- lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
- lib/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
+ strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \
+ lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
+ lib/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \
lib/{libmemusage,libpcprofile,libSegFault}.so \
usr/lib/{pt_chown,{audit,gconv}/*.so}
}
-md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
- '344e06a320fd53b3f267bd4bfb3f681f'
- '7ef69c530a15106de93e4de2df2d393e'
- 'b6c619e5cf91829a15ce34dccef676d5'
- 'addfddd648a4bf832eb126aba944ebae'
- '6970bcfeb3bf88913436d5112d16f588'
- 'c5de2a946215d647c8af5432ec4b0da0'
- '55febbb72139ac7b65757df085024b83'
- '31f415b41197d85d3bbee3d1eecd06a3'
- 'b3526cbd5e29773560dba725db99af5a'
- '3c219ddfb619b6df903cac4cc42c611d'
- '7ae3e426251ae33e73dbad71f9c91378'
- 'f0782ddbf38e0b30ec6b85348816046f'
- '3d844b53b2dbb7c996e39c7ad932f55d'
- '41ae047ac88e8f6f547c70b0a0bc3b72'
- 'fccb89f6628f59752278e125c35941f8'
- '001a4044ac3d59aca6ee144eaca57ab2'
- '94b61302a7ca6c5764d013dc7738fcfe'
- 'a9ffadcfd2d357f91fee0b861fd4a7c6'
- '2c46b8e294de24c531f2253ff69aeef3'
- '7a2998a04ebfcf8bf820540f490ce714'
- '0d77d20fa7fe2f87ad945cb9edb4d91d'
- 'bfdefac3d705f41fbf84b1de1dc945af'
- '3443e89c1e98089cd6c3e3c23f0c3d85'
- '340deaa582a95ddde86edb624c3bfea0'
- '6bbac50e6ff82187654e6a0a7bd849e7'
- 'c483504cf404ed0b44480af627813a97'
- '1419d61fd1dbc6cdc48bb59da86fa66f'
- '7ff501435078b1a2622124fbeaafc921'
- '8d1023a51e0932681b46440d5f8551ee'
- '6962c3fa29306bfbf6f0d22b19cb825d'
- 'b587ee3a70c9b3713099295609afde49'
- '07ac979b6ab5eeb778d55f041529d623'
- '476e9113489f93b348b21e144b6a8fcf')
-md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
- '344e06a320fd53b3f267bd4bfb3f681f'
- '7ef69c530a15106de93e4de2df2d393e'
- 'b6c619e5cf91829a15ce34dccef676d5'
- 'addfddd648a4bf832eb126aba944ebae'
- '6970bcfeb3bf88913436d5112d16f588'
- 'c5de2a946215d647c8af5432ec4b0da0'
- '55febbb72139ac7b65757df085024b83'
- '31f415b41197d85d3bbee3d1eecd06a3'
- 'b3526cbd5e29773560dba725db99af5a'
- '3c219ddfb619b6df903cac4cc42c611d'
- '7ae3e426251ae33e73dbad71f9c91378'
- 'f0782ddbf38e0b30ec6b85348816046f'
- '3d844b53b2dbb7c996e39c7ad932f55d'
- '41ae047ac88e8f6f547c70b0a0bc3b72'
- 'fccb89f6628f59752278e125c35941f8'
- '001a4044ac3d59aca6ee144eaca57ab2'
- '94b61302a7ca6c5764d013dc7738fcfe'
- 'a9ffadcfd2d357f91fee0b861fd4a7c6'
- '2c46b8e294de24c531f2253ff69aeef3'
- '7a2998a04ebfcf8bf820540f490ce714'
- '0d77d20fa7fe2f87ad945cb9edb4d91d'
- 'bfdefac3d705f41fbf84b1de1dc945af'
- '3443e89c1e98089cd6c3e3c23f0c3d85'
- '340deaa582a95ddde86edb624c3bfea0'
- '6bbac50e6ff82187654e6a0a7bd849e7'
- 'c483504cf404ed0b44480af627813a97'
- '1419d61fd1dbc6cdc48bb59da86fa66f'
- '7ff501435078b1a2622124fbeaafc921'
- '8d1023a51e0932681b46440d5f8551ee'
- '6962c3fa29306bfbf6f0d22b19cb825d'
- '589d79041aa767a5179eaa4e2737dd3f'
- 'ad8a9af15ab7eeaa23dc7ee85024af9f'
- 'bccbe5619e75cf1d97312ec3681c605c'
- '07ac979b6ab5eeb778d55f041529d623'
- '476e9113489f93b348b21e144b6a8fcf')
diff --git a/core/glibc/glibc-2.15-revert-c5a0802a.patch b/core/glibc/glibc-2.15-revert-c5a0802a.patch
index f532b95e8..d8894723a 100644
--- a/core/glibc/glibc-2.15-revert-c5a0802a.patch
+++ b/core/glibc/glibc-2.15-revert-c5a0802a.patch
@@ -118,9 +118,9 @@ diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysde
#include <tcb-offsets.h>
#include <pthread-pi-defines.h>
-#include <pthread-errnos.h>
+ #include <stap-probe.h>
#include <kernel-features.h>
-
@@ -137,14 +136,11 @@ __pthread_cond_wait:
cmpl $PI_BIT, %eax
jne 61f
@@ -161,7 +161,7 @@ diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysde
-#if cond_lock != 0
- addq $cond_lock, %rdi
-#endif
-- cmpq $-1, dep_mutex-cond_lock(%rdi)
+- LP_OP(cmp) $-1, dep_mutex-cond_lock(%rdi)
- movl $LLL_PRIVATE, %eax
- movl $LLL_SHARED, %esi
- cmovne %eax, %esi
@@ -187,7 +187,7 @@ diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysde
-#if cond_lock != 0
- addq $cond_lock, %rdi
-#endif
-- cmpq $-1, dep_mutex-cond_lock(%rdi)
+- LP_OP(cmp) $-1, dep_mutex-cond_lock(%rdi)
- movl $LLL_PRIVATE, %eax
- movl $LLL_SHARED, %esi
- cmovne %eax, %esi
@@ -199,7 +199,7 @@ diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysde
-93:
- /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */
- xorq %r10, %r10
-- movq dep_mutex(%rdi), %r8
+- mov dep_mutex(%rdi), %R8_LP
- leaq cond_futex(%rdi), %rdi
- jmp 90b
-.LcleanupEND2:
@@ -224,6 +224,3 @@ diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysde
+ .uleb128 0
.Lcstend:
-
-Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.orig
-Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.rej
diff --git a/core/grep/PKGBUILD b/core/grep/PKGBUILD
index 6d4d76ad7..920b2b73c 100644
--- a/core/grep/PKGBUILD
+++ b/core/grep/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 157327 2012-04-27 00:50:23Z allan $
+# $Id: PKGBUILD 163012 2012-07-05 13:49:01Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=grep
-pkgver=2.12
+pkgver=2.13
pkgrel=1
pkgdesc="A string search utility"
arch=('i686' 'x86_64' 'mips64el')
@@ -14,8 +14,8 @@ depends=('glibc' 'pcre' 'sh')
makedepends=('texinfo')
install=${pkgname}.install
source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
-md5sums=('8d2f0346d08b13c18afb81f0e8aa1e2f'
- '7a25f2ece647b8637f4ae1de474712e7')
+md5sums=('5894d484e6c02249f9702d0d8a472115'
+ '99acaa4d45ab931be2ecba49a1766df7')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/core/libusb-compat/PKGBUILD b/core/libusb-compat/PKGBUILD
index 9ce1c09c1..7367e991b 100644
--- a/core/libusb-compat/PKGBUILD
+++ b/core/libusb-compat/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 158829 2012-05-11 22:12:35Z eric $
+# $Id: PKGBUILD 162998 2012-07-05 06:50:21Z tpowa $
# Maintainer:
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: arjan <arjan@archlinux.org>
pkgname=libusb-compat
pkgver=0.1.4
-pkgrel=1
+pkgrel=2
pkgdesc="Library to enable user space application programs to communicate with USB devices"
arch=('i686' 'x86_64' 'mips64el')
url="http://libusb.sourceforge.net/"
license=('LGPL')
depends=('libusb' 'sh')
options=('!libtool')
-source=("http://downloads.sourceforge.net/${pkgname%-*}/${pkgname}-${pkgver%.*}/$pkgname-$pkgver/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('2ca521fffadd0c28fdf174e6ec73865b')
+source=("http://downloads.sourceforge.net/${pkgname%-*}/${pkgname}-${pkgver%.*}/$pkgname-$pkgver/${pkgname}-${pkgver}.tar.bz2"
+ "libusb-0.1-libusbx.patch")
+md5sums=('2ca521fffadd0c28fdf174e6ec73865b'
+ '1612c3982f307da1332d6db57b16742b')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr
+ # http://libusb.org/ticket/138 can be removed with libusbx 1.0.13
+ patch -Np0 -i ../libusb-0.1-libusbx.patch
+ ./configure --prefix=/usr --disable-static
make
}
@@ -25,3 +29,4 @@ package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
}
+
diff --git a/core/libusb-compat/libusb-0.1-libusbx.patch b/core/libusb-compat/libusb-0.1-libusbx.patch
new file mode 100644
index 000000000..61563651b
--- /dev/null
+++ b/core/libusb-compat/libusb-0.1-libusbx.patch
@@ -0,0 +1,17 @@
+http://bugs.gentoo.org/423135
+
+--- libusb/core.c
++++ libusb/core.c
+@@ -32,12 +32,6 @@
+ static libusb_context *ctx = NULL;
+ static int usb_debug = 0;
+
+-enum usbi_log_level {
+- LOG_LEVEL_DEBUG,
+- LOG_LEVEL_INFO,
+- LOG_LEVEL_WARNING,
+- LOG_LEVEL_ERROR,
+-};
+
+ #ifdef ENABLE_LOGGING
+ #define _usbi_log(level, fmt...) usbi_log(level, __FUNCTION__, fmt)
diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD
index 49780ffdc..308172cdc 100644
--- a/core/lvm2/PKGBUILD
+++ b/core/lvm2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 162154 2012-06-22 12:56:20Z dreisner $
+# $Id: PKGBUILD 163019 2012-07-05 20:37:09Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgbase=lvm2
pkgname=('lvm2' 'device-mapper')
pkgver=2.02.96
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64' 'mips64el')
url="http://sourceware.org/lvm2/"
license=('GPL2' 'LGPL2.1')
@@ -31,7 +31,8 @@ build() {
./configure --prefix=/ --sbindir=/sbin --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \
--includedir=/usr/include --with-usrlibdir=/usr/lib --libdir=/usr/lib --with-udev-prefix=/usr \
--with-systemdsystemunitdir=/usr/lib/systemd/system --enable-pkgconfig --enable-readline \
- --enable-dmeventd --enable-cmdlib --enable-applib --enable-udev_sync --enable-udev_rules
+ --enable-dmeventd --enable-cmdlib --enable-applib --enable-udev_sync --enable-udev_rules \
+ --with-default-locking-dir=/run/lock/lvm
make
}
diff --git a/core/mpfr/PKGBUILD b/core/mpfr/PKGBUILD
index e6749bb8c..72a063efa 100644
--- a/core/mpfr/PKGBUILD
+++ b/core/mpfr/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 158831 2012-05-11 23:28:49Z allan $
+# $Id: PKGBUILD 163011 2012-07-05 13:48:54Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: damir <damir@archlinux.org>
pkgname=mpfr
-_pkgver=3.1.0
-_patchlevel=p10
-pkgver=${_pkgver}.${_patchlevel}
+_pkgver=3.1.1
+#_patchlevel=p1
+#pkgver=${_pkgver}.${_patchlevel}
+pkgver=${_pkgver}
pkgrel=1
pkgdesc="Multiple-precision floating-point library"
arch=('i686' 'x86_64' 'mips64el')
@@ -14,15 +15,12 @@ license=('LGPL')
depends=('gmp>=5.0')
options=('!libtool')
install=mpfr.install
-source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz{,.asc}
- mpfr-${_pkgver}.${_patchlevel}.patch)
-md5sums=('6e495841bb026481567006cec0f821c3'
- '293374ee4b01527f8f7889fdfa9016f8'
- '776954381923739ef0e618d992188535')
+source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz{,.asc})
+md5sums=('91d51c41fcf2799e4ee7a7126fc95c17'
+ '91b187a2229211e543ba6fb82a079b2c')
build() {
cd "${srcdir}/${pkgname}-${_pkgver}"
- patch -Np1 -i $srcdir/mpfr-${_pkgver}.${_patchlevel}.patch
./configure --prefix=/usr --enable-thread-safe --enable-shared
make
}
diff --git a/core/shadow/PKGBUILD b/core/shadow/PKGBUILD
index 6c474e13d..dcb4b472e 100644
--- a/core/shadow/PKGBUILD
+++ b/core/shadow/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 151546 2012-02-27 16:22:05Z dreisner $
+# $Id: PKGBUILD 162993 2012-07-04 21:45:24Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Maintainer: Aaron Griffin <aaron@archlinux.org>
pkgname=shadow
-pkgver=4.1.5
-pkgrel=4
+pkgver=4.1.5.1
+pkgrel=1
pkgdesc="Password and account management tool suite with support for shadow files and PAM"
arch=('i686' 'x86_64' 'mips64el')
url='http://pkg-shadow.alioth.debian.org/'
@@ -12,9 +12,9 @@ license=('BSD')
groups=('base')
depends=('bash' 'pam' 'acl')
backup=(etc/login.defs
- etc/pam.d/{chage,login,passwd,shadow,useradd,usermod,userdel}
+ etc/pam.d/{chage,passwd,shadow,useradd,usermod,userdel}
etc/pam.d/{chpasswd,newusers,groupadd,groupdel,groupmod}
- etc/pam.d/{chfn,chgpasswd,groupmems,chsh}
+ etc/pam.d/{chgpasswd,groupmems}
etc/default/useradd)
options=('!libtool')
install='shadow.install'
@@ -24,37 +24,27 @@ source=("http://pkg-shadow.alioth.debian.org/releases/$pkgname-$pkgver.tar.bz2"{
chgpasswd
chpasswd
defaults.pam
- login
login.defs
newusers
passwd
shadow.cron.daily
useradd.defaults
- nscd-error-reporting.patch
xstrdup.patch
- shadow-strncpy-usage.patch
- shadow-add-missing-include.patch
- userdel-avoid-bad-mem-access.patch
- write-utmp-wtmp-entries.patch)
-sha1sums=('3ab1ae0e30af36d04445314fcb5a079bdf05de41'
- '0a31aafceb948a91fe7370a6378cafd6fd883145'
+ shadow-strncpy-usage.patch)
+sha1sums=('81f38720b953ef9c2c100c43d02dfe19cafd6c30'
+ '126570e2939bf3b57f28df5197ab9309747a6b5c'
'33a6cf1e44a1410e5c9726c89e5de68b78f5f922'
'78ec184a499f9708adcfcf0b7a3b22a60bf39f91'
'4ad0e059406a305c8640ed30d93c2a1f62c2f4ad'
'12427b1ca92a9b85ca8202239f0d9f50198b818f'
'0e56fed7fc93572c6bf0d8f3b099166558bb46f1'
- '895aad07c192b288b457e19dd7b8c55841b4ad22'
'e5cab2118ecb1e61874cde842d7d04d1003f35cb'
'12427b1ca92a9b85ca8202239f0d9f50198b818f'
'611be25d91c3f8f307c7fe2485d5f781e5dee75f'
'5d83ba7e11c765c951867cbe00b0ae7ff57148fa'
'9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19'
- 'ae6eebb842c433ac4022c493294a13ed68e06acc'
'6010fffeed1fc6673ad9875492e1193b1a847b53'
- '21e12966a6befb25ec123b403cd9b5c492fe5b16'
- '0697a21f7519de30821da7772677035652df4ad2'
- 'e1dd93d82c6eba76b5f17a9fefad4bbc513cff5b'
- 'bcef8558c9123b396d2d4df26c815a951f97a91a')
+ '21e12966a6befb25ec123b403cd9b5c492fe5b16')
build() {
cd "$pkgname-$pkgver"
@@ -69,16 +59,6 @@ build() {
patch -Np1 <"$srcdir/xstrdup.patch"
patch -Np1 <"$srcdir/shadow-strncpy-usage.patch"
- # backports queued for 4.1.5.1
- patch -Np1 <"$srcdir/shadow-add-missing-include.patch"
- patch -Np1 <"$srcdir/nscd-error-reporting.patch"
-
- # sent to ML
- patch -Np0 <"$srcdir/userdel-avoid-bad-mem-access.patch"
-
- # revert to fix FS#28543
- patch -RNp1 <"$srcdir/write-utmp-wtmp-entries.patch"
-
# supress etc/pam.d/*, we provide our own
sed -i '/^SUBDIRS/s/pam.d//' etc/Makefile.in
@@ -115,18 +95,37 @@ package() {
# PAM config - custom
install -dm755 "$pkgdir/etc/pam.d"
- install -t "$pkgdir/etc/pam.d" -m644 "$srcdir"/{login,passwd,chgpasswd,chpasswd,newusers}
+ install -t "$pkgdir/etc/pam.d" -m644 "$srcdir"/{passwd,chgpasswd,chpasswd,newusers}
# PAM config - from tarball
install -Dm644 etc/pam.d/groupmems "$pkgdir/etc/pam.d/groupmems"
# we use the 'useradd' PAM file for other similar utilities
- for file in chage chfn chsh groupadd groupdel groupmod shadow \
+ for file in chage groupadd groupdel groupmod shadow \
useradd usermod userdel; do
install -Dm644 "$srcdir/defaults.pam" "$pkgdir/etc/pam.d/$file"
done
- # Remove su - using su from coreutils instead
- rm "$pkgdir/bin/su"
- find "$pkgdir/usr/share/man" -name 'su.1' -delete
+ # Remove utilities provided by util-linux
+ rm \
+ "$pkgdir"/usr/bin/{chsh,chfn,sg} \
+ "$pkgdir"/bin/{login,su} \
+ "$pkgdir"/usr/sbin/{vipw,vigr}
+
+ # but we keep newgrp, as sg is really an alias to it
+ mv "$pkgdir"/usr/bin/{newgrp,sg}
+
+ # ...and their many man pages
+ find "$pkgdir"/usr/share/man \
+ '(' -name 'chsh.1' -o \
+ -name 'chfn.1' -o \
+ -name 'su.1' -o \
+ -name 'login.1' -o \
+ -name 'vipw.8' -o \
+ -name 'vigr.8' -o \
+ -name 'newgrp.1' ')' \
+ -delete
+ rmdir \
+ "$pkgdir"/usr/share/man/{fi,id,zh_TW}/man1 \
+ "$pkgdir"/usr/share/man/{fi,ko/man8}
}
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD
index 21e3289e4..963879f71 100644
--- a/core/util-linux/PKGBUILD
+++ b/core/util-linux/PKGBUILD
@@ -1,20 +1,23 @@
-# $Id: PKGBUILD 160349 2012-06-01 12:56:46Z dreisner $
+# $Id: PKGBUILD 162992 2012-07-04 21:44:53Z dreisner $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=util-linux
pkgver=2.21.2
-pkgrel=1.1
+pkgrel=3
pkgdesc="Miscellaneous system utilities for Linux"
url="http://www.kernel.org/pub/linux/utils/util-linux/"
arch=('i686' 'x86_64' 'mips64el')
groups=('base')
-depends=('udev' 'pam')
+depends=('pam')
conflicts=('util-linux-ng')
provides=("util-linux-ng=${pkgver}")
license=('GPL2')
options=('!libtool')
-source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.21/${pkgname}-${pkgver}.tar.xz)
+source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.21/${pkgname}-${pkgver}.tar.xz
+ pam-login
+ pam-common)
+backup=(etc/pam.d/chfn etc/pam.d/chsh etc/pam.d/login)
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -28,13 +31,14 @@ build() {
--enable-write \
--enable-raw \
--disable-wall \
- --enable-new-mount
+ --enable-new-mount \
+ --enable-login-utils
make
}
check() {
- make -C "$pkgname-$pkgver" check
+ make -C "$pkgname-$pkgver" check
}
package() {
@@ -51,5 +55,15 @@ package() {
# delete stray empty dir, fixed upstream
rm -r usr/share/man/ru
+
+ # setuid chfn and chsh
+ chmod 4755 "$pkgdir"/usr/bin/ch{sh,fn}
+
+ # install PAM files for login-utils
+ install -Dm644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chfn"
+ install -m644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chsh"
+ install -m644 "$srcdir/pam-login" "$pkgdir/etc/pam.d/login"
}
-md5sums=('54ba880f1d66782c2287ee2c898520e9')
+md5sums=('54ba880f1d66782c2287ee2c898520e9'
+ '4368b3f98abd8a32662e094c54e7f9b1'
+ 'a31374fef2cba0ca34dfc7078e2969e4')
diff --git a/core/util-linux/pam-common b/core/util-linux/pam-common
new file mode 100644
index 000000000..a7bf8a4a5
--- /dev/null
+++ b/core/util-linux/pam-common
@@ -0,0 +1,6 @@
+#%PAM-1.0
+auth sufficient pam_rootok.so
+auth required pam_unix.so
+account required pam_unix.so
+session required pam_unix.so
+password required pam_permit.so
diff --git a/core/util-linux/pam-login b/core/util-linux/pam-login
new file mode 100644
index 000000000..1960d9497
--- /dev/null
+++ b/core/util-linux/pam-login
@@ -0,0 +1,7 @@
+#%PAM-1.0
+
+auth required pam_securetty.so
+auth requisite pam_nologin.so
+auth include system-local-login
+account include system-local-login
+session include system-local-login
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-08-15 19:10:11 +0000