diff options
author | Juergen Daubert <jue@jue.li> | 2016-08-19 12:51:46 +0200 |
---|---|---|
committer | Juergen Daubert <jue@jue.li> | 2016-08-19 12:51:46 +0200 |
commit | 8d3ffc1020d517a9af2553e65aab6742b5c8d9cc (patch) | |
tree | 18c90c7b0a4f315c3ab232271c0608d33605231f | |
parent | 68bddc89b91369dd4f1df8e528dba9935ee02707 (diff) | |
parent | 5856c13b72d1188c9c22bc77b625a5d2aeb2a0ee (diff) | |
download | core-8d3ffc1020d517a9af2553e65aab6742b5c8d9cc.tar.gz core-8d3ffc1020d517a9af2553e65aab6742b5c8d9cc.tar.xz |
Merge remote-tracking branch 'origin/3.2' into 3.3
-rw-r--r-- | dhcpcd/.md5sum | 2 | ||||
-rw-r--r-- | dhcpcd/Pkgfile | 2 | ||||
-rw-r--r-- | libdevmapper/.md5sum | 2 | ||||
-rw-r--r-- | libdevmapper/Pkgfile | 6 | ||||
-rw-r--r-- | man-db/.footprint | 4 | ||||
-rw-r--r-- | man-db/Pkgfile | 4 | ||||
-rw-r--r-- | util-linux/.md5sum | 2 | ||||
-rw-r--r-- | util-linux/Pkgfile | 2 | ||||
-rw-r--r-- | vim/.footprint | 1 | ||||
-rw-r--r-- | vim/.md5sum | 2 | ||||
-rw-r--r-- | vim/Pkgfile | 4 |
11 files changed, 13 insertions, 18 deletions
diff --git a/dhcpcd/.md5sum b/dhcpcd/.md5sum index 1a14a0ed..c6b04e9c 100644 --- a/dhcpcd/.md5sum +++ b/dhcpcd/.md5sum @@ -1 +1 @@ -2d19e28a0d24ff9f06fa98e28ceb1afd dhcpcd-6.11.2.tar.xz +d4f2f3ed4964197dee7767219c33a9df dhcpcd-6.11.3.tar.xz diff --git a/dhcpcd/Pkgfile b/dhcpcd/Pkgfile index b37ffef3..6f1db31d 100644 --- a/dhcpcd/Pkgfile +++ b/dhcpcd/Pkgfile @@ -4,7 +4,7 @@ # Depends on: eudev name=dhcpcd -version=6.11.2 +version=6.11.3 release=1 source=(http://roy.marples.name/downloads/dhcpcd/$name-$version.tar.xz) diff --git a/libdevmapper/.md5sum b/libdevmapper/.md5sum index 987b49d4..b8e7eb0a 100644 --- a/libdevmapper/.md5sum +++ b/libdevmapper/.md5sum @@ -1 +1 @@ -cc108c19b1e1b5b2002fb0a9bcb2d077 LVM2.2.02.162.tgz +839702f282977b3cc2e6ddc5ef9d9907 LVM2.2.02.164.tgz diff --git a/libdevmapper/Pkgfile b/libdevmapper/Pkgfile index f1436dff..8c6cf348 100644 --- a/libdevmapper/Pkgfile +++ b/libdevmapper/Pkgfile @@ -4,12 +4,12 @@ # Depends on: eudev util-linux name=libdevmapper -version=1.02.132 +version=1.02.133 release=1 -source=(http://mirrors.kernel.org/sources.redhat.com/lvm2/releases/LVM2.2.02.162.tgz) +source=(http://mirrors.kernel.org/sources.redhat.com/lvm2/releases/LVM2.2.02.164.tgz) build() { - cd LVM2.2.02.162 + cd LVM2.2.02.164 ./configure --prefix=/usr \ --exec-prefix= \ diff --git a/man-db/.footprint b/man-db/.footprint index 0f5c6a40..20645997 100644 --- a/man-db/.footprint +++ b/man-db/.footprint @@ -28,10 +28,6 @@ drwxr-xr-x root/root usr/lib/man-db/man-db/ drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/accessdb drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/doc/ -drwxr-xr-x root/root usr/share/doc/man-db/ --rw-r--r-- root/root usr/share/doc/man-db/man-db-manual.ps --rw-r--r-- root/root usr/share/doc/man-db/man-db-manual.txt drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/apropos.1.gz diff --git a/man-db/Pkgfile b/man-db/Pkgfile index 723391a5..09762cf9 100644 --- a/man-db/Pkgfile +++ b/man-db/Pkgfile @@ -5,7 +5,7 @@ name=man-db version=2.7.5 -release=1 +release=2 source=(http://download.savannah.gnu.org/releases/$name/$name-$version.tar.xz \ mandb.cron) @@ -18,7 +18,7 @@ build() { make make DESTDIR=$PKG install - #rm -r $PKG/usr/share + rm -r $PKG/usr/share/doc rm -r $PKG/usr/lib/tmpfiles.d install -d $PKG/var/cache/man diff --git a/util-linux/.md5sum b/util-linux/.md5sum index 12f80fab..76252b81 100644 --- a/util-linux/.md5sum +++ b/util-linux/.md5sum @@ -1 +1 @@ -e534e6ccc49107e5d31c329af798ef7d util-linux-2.28.tar.xz +e2d863efaf4fd330a42c5efe9f1b02b4 util-linux-2.28.1.tar.xz diff --git a/util-linux/Pkgfile b/util-linux/Pkgfile index 9b468bf6..994d48e4 100644 --- a/util-linux/Pkgfile +++ b/util-linux/Pkgfile @@ -4,7 +4,7 @@ # Depends on: eudev ncurses zlib name=util-linux -version=2.28 +version=2.28.1 release=1 source=(https://www.kernel.org/pub/linux/utils/$name/v2.28/$name-$version.tar.xz) diff --git a/vim/.footprint b/vim/.footprint index 91420102..c84d04fd 100644 --- a/vim/.footprint +++ b/vim/.footprint @@ -147,6 +147,7 @@ drwxr-xr-x root/root usr/share/vim/compiler/ -rw-r--r-- root/root usr/share/vim/compiler/xbuild.vim -rw-r--r-- root/root usr/share/vim/compiler/xmllint.vim -rw-r--r-- root/root usr/share/vim/compiler/xmlwf.vim +-rw-r--r-- root/root usr/share/vim/defaults.vim -rw-r--r-- root/root usr/share/vim/delmenu.vim drwxr-xr-x root/root usr/share/vim/doc/ -rw-r--r-- root/root usr/share/vim/doc/arabic.txt diff --git a/vim/.md5sum b/vim/.md5sum index c7e807bd..afc258f9 100644 --- a/vim/.md5sum +++ b/vim/.md5sum @@ -1 +1 @@ -66fdc62dea2e595d552f58d0ee90ec96 vim-7.4.1947.tar.xz +bd5a6647a4b15460df88b985db9684a9 vim-7.4.2225.tar.xz diff --git a/vim/Pkgfile b/vim/Pkgfile index 39f510c6..dad4d973 100644 --- a/vim/Pkgfile +++ b/vim/Pkgfile @@ -4,7 +4,7 @@ # Depends on: ncurses acl name=vim -version=7.4.1947 +version=7.4.2225 release=1 source=(http://crux.nu/files/distfiles/$name-$version.tar.xz) @@ -47,6 +47,4 @@ build () { make VIMRTDIR= make -j1 VIMRTDIR= DESTDIR=$PKG installvimbin - - sed -i '/^packadd matchit/s/^/" /' $PKG/usr/share/vim/vimrc } |