diff options
| author | Fredrik Rinnestam <fredrik@crux.nu> | 2016-09-24 18:37:39 +0200 |
|---|---|---|
| committer | Fredrik Rinnestam <fredrik@crux.nu> | 2016-09-24 18:37:39 +0200 |
| commit | 65c3affda44ca43ddc27318321166872f706046b (patch) | |
| tree | b8a07c16a7d7c80e2d92e9e2f6f66a64cbfcbe13 | |
| parent | 32d3520029aa9727f0d8d152d4085676d36dfaaa (diff) | |
| parent | 9d3a6c867da98a747e9a6f1309fae9b326d61f98 (diff) | |
| download | core-65c3affda44ca43ddc27318321166872f706046b.tar.gz core-65c3affda44ca43ddc27318321166872f706046b.tar.xz | |
Merge branch '3.2' into 3.3
| -rw-r--r-- | dash/.md5sum | 2 | ||||
| -rw-r--r-- | dash/Pkgfile | 2 | ||||
| -rw-r--r-- | sudo/.md5sum | 2 | ||||
| -rw-r--r-- | sudo/Pkgfile | 2 | ||||
| -rw-r--r-- | vim/.footprint | 3 | ||||
| -rw-r--r-- | vim/.md5sum | 2 | ||||
| -rw-r--r-- | vim/Pkgfile | 3 |
7 files changed, 10 insertions, 6 deletions
diff --git a/dash/.md5sum b/dash/.md5sum index f95fd80a..1ec2e901 100644 --- a/dash/.md5sum +++ b/dash/.md5sum @@ -1 +1 @@ -57341c24c3ebd3d5fc3a863001c94be6 dash-0.5.9.tar.gz +6472702a8d9760d166ef8333dcb527a6 dash-0.5.9.1.tar.gz diff --git a/dash/Pkgfile b/dash/Pkgfile index d3b7f08a..e9b77ee5 100644 --- a/dash/Pkgfile +++ b/dash/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=dash -version=0.5.9 +version=0.5.9.1 release=1 source=(http://gondor.apana.org.au/~herbert/dash/files/$name-$version.tar.gz) diff --git a/sudo/.md5sum b/sudo/.md5sum index 9534406b..9410aa83 100644 --- a/sudo/.md5sum +++ b/sudo/.md5sum @@ -1 +1 @@ -50a840a688ceb6fa3ab24fc0adf4fa23 sudo-1.8.17p1.tar.gz +c1201904fd9144ea5e7cd9496fcbbc64 sudo-1.8.18.tar.gz diff --git a/sudo/Pkgfile b/sudo/Pkgfile index 729d7d1d..667b1df4 100644 --- a/sudo/Pkgfile +++ b/sudo/Pkgfile @@ -4,7 +4,7 @@ # Depends on: zlib name=sudo -version=1.8.17p1 +version=1.8.18 release=1 source=(http://www.sudo.ws/$name/dist/$name-$version.tar.gz) diff --git a/vim/.footprint b/vim/.footprint index c84d04fd..a74685de 100644 --- a/vim/.footprint +++ b/vim/.footprint @@ -446,6 +446,7 @@ drwxr-xr-x root/root usr/share/vim/ftplugin/ -rw-r--r-- root/root usr/share/vim/ftplugin/rst.vim -rw-r--r-- root/root usr/share/vim/ftplugin/ruby.vim -rw-r--r-- root/root usr/share/vim/ftplugin/sass.vim +-rw-r--r-- root/root usr/share/vim/ftplugin/scala.vim -rw-r--r-- root/root usr/share/vim/ftplugin/scheme.vim -rw-r--r-- root/root usr/share/vim/ftplugin/screen.vim -rw-r--r-- root/root usr/share/vim/ftplugin/scss.vim @@ -583,6 +584,7 @@ drwxr-xr-x root/root usr/share/vim/indent/ -rw-r--r-- root/root usr/share/vim/indent/rst.vim -rw-r--r-- root/root usr/share/vim/indent/ruby.vim -rw-r--r-- root/root usr/share/vim/indent/sass.vim +-rw-r--r-- root/root usr/share/vim/indent/scala.vim -rw-r--r-- root/root usr/share/vim/indent/scheme.vim -rw-r--r-- root/root usr/share/vim/indent/scss.vim -rw-r--r-- root/root usr/share/vim/indent/sdl.vim @@ -1132,6 +1134,7 @@ drwxr-xr-x root/root usr/share/vim/syntax/ -rw-r--r-- root/root usr/share/vim/syntax/sas.vim -rw-r--r-- root/root usr/share/vim/syntax/sass.vim -rw-r--r-- root/root usr/share/vim/syntax/sather.vim +-rw-r--r-- root/root usr/share/vim/syntax/scala.vim -rw-r--r-- root/root usr/share/vim/syntax/scheme.vim -rw-r--r-- root/root usr/share/vim/syntax/scilab.vim -rw-r--r-- root/root usr/share/vim/syntax/screen.vim diff --git a/vim/.md5sum b/vim/.md5sum index afc258f9..73f1b789 100644 --- a/vim/.md5sum +++ b/vim/.md5sum @@ -1 +1 @@ -bd5a6647a4b15460df88b985db9684a9 vim-7.4.2225.tar.xz +5910d52e9f4f817124462b84a4e63b72 vim-8.0.0008.tar.xz diff --git a/vim/Pkgfile b/vim/Pkgfile index dad4d973..324cd77c 100644 --- a/vim/Pkgfile +++ b/vim/Pkgfile @@ -4,7 +4,7 @@ # Depends on: ncurses acl name=vim -version=7.4.2225 +version=8.0.0008 release=1 source=(http://crux.nu/files/distfiles/$name-$version.tar.xz) @@ -26,6 +26,7 @@ build () { mv $PKG/usr/share/vim/vimrc_example.vim $PKG/usr/share/vim/vimrc rm -r $PKG/usr/{share/man/man?/vimtutor*,share/vim/{tutor,macros},bin/vimtutor} rm $PKG/usr/share/vim/*/README.txt + rm -rf $PKG/usr/share/{applications,icons} ln -sf vim $PKG/usr/bin/evim ln -sf /bin/vi $PKG/usr/bin/vi ln -sf vim.1.gz $PKG/usr/share/man/man1/ex.1.gz |