November 2015 - crux-commits

ports/opt (3.2): php-ftp: update to 5.6.15
by crux＠crux.nu 05 Nov '15

05 Nov '15

commit d452ad0339bce8143702df8d3946c0447e2da2f3 Author: Juergen Daubert <jue(a)jue.li> Date: Wed Nov 4 17:30:33 2015 +0100 php-ftp: update to 5.6.15 diff --git a/php-ftp/.md5sum b/php-ftp/.md5sum index 0596540..8fa5571 100644 --- a/php-ftp/.md5sum +++ b/php-ftp/.md5sum @@ -1 +1 @@ -05d54cad22f393f4b5b0ec0ab06a2b91 php-5.5.29.tar.xz +c726a86238017c2d9db0171b14d300e7 php-5.6.15.tar.xz diff --git a/php-ftp/Pkgfile b/php-ftp/Pkgfile index 30b1a84..a2e6e1e 100644 --- a/php-ftp/Pkgfile +++ b/php-ftp/Pkgfile @@ -1,10 +1,11 @@ -# Description: FTP module for PHP -# URL: http://www.php.net -# Maintainer: Alan Mizrahi, alan at mizrahi dot com dot ve -# Depends on: +# Description: FTP module for PHP +# URL: http://www.php.net +# Maintainer: Juergen Daubert, jue at crux dot nu +# Packager: Alan Mizrahi, alan at mizrahi dot com dot ve +# Depends on: name=php-ftp -version=5.5.29 +version=5.6.15 release=1 source=(http://www.php.net/distributions/php-$version.tar.xz)

1 0

ports/opt (3.2): Merge branch '3.1' into 3.2
by crux＠crux.nu 05 Nov '15

05 Nov '15

commit a436439e78a7f0da1891e1ce064f0a12f3987b21 Merge: 637e169 ddcb2fb Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Fri Nov 6 00:30:28 2015 +0100 Merge branch '3.1' into 3.2

1 0

ports/opt (3.2): [notify] nss: updated to 3.20.1. Fixes for CVE-2015-7181, CVE-2015-7182.
by crux＠crux.nu 05 Nov '15

05 Nov '15

commit ddcb2fb5c73622374e3f7f479a51207159cac1a2 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Fri Nov 6 00:28:20 2015 +0100 [notify] nss: updated to 3.20.1. Fixes for CVE-2015-7181, CVE-2015-7182. Advisory: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_3.20.1_re… diff --git a/nss/.md5sum b/nss/.md5sum index ccb6cda..b4de5bd 100644 --- a/nss/.md5sum +++ b/nss/.md5sum @@ -1,3 +1,3 @@ -db83988499d1eb3b623d77ecf495b0f5 nss-3.20.tar.gz +c285ef92de0031cb0a8caa60d396d618 nss-3.20.1.tar.gz 17226659298a9d9bb3f323186d220f6f nss-config.in a796e6ab6c87573ffb649ce8769bc07a nss.pc.in diff --git a/nss/Pkgfile b/nss/Pkgfile index 14d8f4d..ee4e6ca 100644 --- a/nss/Pkgfile +++ b/nss/Pkgfile @@ -4,9 +4,9 @@ # Depends on: nspr sqlite3 name=nss -version=3.20 +version=3.20.1 release=1 -source=(http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_20_RTM/src/$name-$version.tar.gz \ +source=(http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_20_1_RTM/src/$name-$version.tar.gz \ nss-config.in nss.pc.in) build() {

1 0

ports/opt (3.2): lua: 5.2.3 -> 5.3.1
by crux＠crux.nu 05 Nov '15

05 Nov '15

commit 71a1d31a7837713034c5885969a19b3afc15c087 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Thu Nov 5 19:11:18 2015 +1100 lua: 5.2.3 -> 5.3.1 diff --git a/lua/.footprint b/lua/.footprint index e7093a9..9b13b7b 100644 --- a/lua/.footprint +++ b/lua/.footprint @@ -1,7 +1,9 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/lua +lrwxrwxrwx root/root usr/bin/lua5.3 -> /usr/bin/lua -rwxr-xr-x root/root usr/bin/luac +lrwxrwxrwx root/root usr/bin/luac5.3 -> /usr/bin/luac drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/lauxlib.h -rw-r--r-- root/root usr/include/lua.h @@ -10,11 +12,10 @@ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/lualib.h drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/liblua.a -lrwxrwxrwx root/root usr/lib/liblua.so -> liblua.so.5.2 -lrwxrwxrwx root/root usr/lib/liblua.so.5.2 -> liblua.so.5.2.3 --rw-r--r-- root/root usr/lib/liblua.so.5.2.3 +-rw-r--r-- root/root usr/lib/liblua.so.5.3 +-rw-r--r-- root/root usr/lib/liblua.so.5.3.1 drwxr-xr-x root/root usr/lib/lua/ -drwxr-xr-x root/root usr/lib/lua/5.2/ +drwxr-xr-x root/root usr/lib/lua/5.3/ drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/lua.pc drwxr-xr-x root/root usr/man/ @@ -23,4 +24,4 @@ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/luac.1.gz drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/lua/ -drwxr-xr-x root/root usr/share/lua/5.2/ +drwxr-xr-x root/root usr/share/lua/5.3/ diff --git a/lua/.md5sum b/lua/.md5sum index 8aead05..fc20c41 100644 --- a/lua/.md5sum +++ b/lua/.md5sum @@ -1,3 +1,3 @@ -bdc663c7b82ffc0b5df67611621fb625 liblua.so.patch -dc7f94ec6ff15c985d2d6ad0f1b35654 lua-5.2.3.tar.gz +85fe4e5f780376457eba3bc23d2cb2d3 liblua.so.patch +797adacada8d85761c079390ff1d9961 lua-5.3.1.tar.gz e7ba6c2b695b0b84a5ea0cbff5fc9067 lua.pc diff --git a/lua/Pkgfile b/lua/Pkgfile index b06a134..3561251 100644 --- a/lua/Pkgfile +++ b/lua/Pkgfile @@ -5,8 +5,8 @@ # Depends on: readline name=lua -version=5.2.3 -release=2 +version=5.3.1 +release=1 source=(http://www.lua.org/ftp/$name-$version.tar.gz liblua.so.patch lua.pc) @@ -14,18 +14,18 @@ build() { cd $name-$version patch -p 1 -i $SRC/liblua.so.patch - export CFLAGS="$CFLAGS -fPIC" + export CFLAGS="$CFLAGS -fPIC -DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1" make MYCFLAGS="$CFLAGS" MYLDFLAGS="$LDFLAGS" linux make \ - TO_LIB="liblua.a liblua.so.$version" \ + TO_LIB="liblua.a liblua.so.${version:0:3} liblua.so.$version" \ INSTALL_TOP=$PKG/usr install - ln -sf liblua.so.$version $PKG/usr/lib/liblua.so.${version:0:3} - ln -sf liblua.so.${version:0:3} $PKG/usr/lib/liblua.so + ln -sf /usr/bin/lua $PKG/usr/bin/lua${version:0:3} + ln -sf /usr/bin/luac $PKG/usr/bin/luac${version:0:3} #make pc > lua.pc - sed "s/%VER%/${version%.*}/g;s/%REL%/$version/g" $SRC/lua.pc > lua.pc + sed "s/%VER%/${version:0:3}/g;s/%REL%/$version/g" $SRC/lua.pc > lua.pc install -m 0644 -D lua.pc $PKG/usr/lib/pkgconfig/lua.pc } diff --git a/lua/liblua.so.patch b/lua/liblua.so.patch index 92c1f3a..f9e24f3 100644 --- a/lua/liblua.so.patch +++ b/lua/liblua.so.patch @@ -1,7 +1,8 @@ -diff -ru lua-5.2.1/Makefile lua-5.2.1.new/Makefile ---- lua-5.2.1/Makefile 2012-05-17 16:05:54.000000000 +0200 -+++ lua-5.2.1.new/Makefile 2012-09-12 22:39:07.162748096 +0200 -@@ -52,7 +52,7 @@ +diff --git a/Makefile b/Makefile +index 7fa91c8..dccf485 100644 +--- a/Makefile ++++ b/Makefile +@@ -52,7 +52,7 @@ R= $V.0 all: $(PLAT) $(PLATS) clean: @@ -10,30 +11,19 @@ diff -ru lua-5.2.1/Makefile lua-5.2.1.new/Makefile test: dummy src/lua -v -diff -ru lua-5.2.1/src/luaconf.h lua-5.2.1.new/src/luaconf.h ---- lua-5.2.1/src/luaconf.h 2012-05-11 16:14:42.000000000 +0200 -+++ lua-5.2.1.new/src/luaconf.h 2012-09-12 22:40:27.986622772 +0200 -@@ -100,7 +100,7 @@ - #else /* }{ */ - - #define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/" --#define LUA_ROOT "/usr/local/" -+#define LUA_ROOT "/usr/" - #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR - #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR - #define LUA_PATH_DEFAULT \ -diff -ru lua-5.2.1/src/Makefile lua-5.2.1.new/src/Makefile ---- lua-5.2.1/src/Makefile 2012-03-09 17:32:16.000000000 +0100 -+++ lua-5.2.1.new/src/Makefile 2012-09-12 22:38:08.591386896 +0200 -@@ -29,6 +29,7 @@ - PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris +diff --git a/src/Makefile b/src/Makefile +index 2e7a412..fa5769f 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -29,6 +29,7 @@ MYOBJS= + PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris LUA_A= liblua.a +LUA_SO= liblua.so CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \ ltm.o lundump.o lvm.o lzio.o -@@ -43,7 +44,7 @@ +@@ -43,7 +44,7 @@ LUAC_T= luac LUAC_O= luac.o ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) @@ -42,7 +32,7 @@ diff -ru lua-5.2.1/src/Makefile lua-5.2.1.new/src/Makefile ALL_A= $(LUA_A) # Targets start here. -@@ -59,6 +60,12 @@ +@@ -59,6 +60,12 @@ $(LUA_A): $(BASE_O) $(AR) $@ $(BASE_O) $(RANLIB) $@ @@ -55,3 +45,16 @@ diff -ru lua-5.2.1/src/Makefile lua-5.2.1.new/src/Makefile $(LUA_T): $(LUA_O) $(LUA_A) $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) +diff --git a/src/luaconf.h b/src/luaconf.h +index fd28d21..e2662cc 100644 +--- a/src/luaconf.h ++++ b/src/luaconf.h +@@ -175,7 +175,7 @@ + + #else /* }{ */ + +-#define LUA_ROOT "/usr/local/" ++#define LUA_ROOT "/usr/" + #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/" + #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/" + #define LUA_PATH_DEFAULT \

1 0

ports/opt (3.2): php-sockets: update to 5.6.15
by crux＠crux.nu 05 Nov '15

05 Nov '15

commit 15586b56b694be11463018ba2798810a5920f6d7 Author: Juergen Daubert <jue(a)jue.li> Date: Wed Nov 4 17:31:10 2015 +0100 php-sockets: update to 5.6.15 diff --git a/php-sockets/.md5sum b/php-sockets/.md5sum index 0596540..8fa5571 100644 --- a/php-sockets/.md5sum +++ b/php-sockets/.md5sum @@ -1 +1 @@ -05d54cad22f393f4b5b0ec0ab06a2b91 php-5.5.29.tar.xz +c726a86238017c2d9db0171b14d300e7 php-5.6.15.tar.xz diff --git a/php-sockets/Pkgfile b/php-sockets/Pkgfile index 2667ba8..b9cc0cb 100644 --- a/php-sockets/Pkgfile +++ b/php-sockets/Pkgfile @@ -1,10 +1,11 @@ -# Description: Socket module for PHP -# URL: http://www.php.net -# Maintainer: Alan Mizrahi, alan at mizrahi dot com dot ve +# Description: Socket module for PHP +# URL: http://www.php.net +# Maintainer: Juergen Daubert, jue at crux dot nu +# Packager: Alan Mizrahi, alan at mizrahi dot com dot ve # Depends on: name=php-sockets -version=5.5.29 +version=5.6.15 release=1 source=(http://www.php.net/distributions/php-$version.tar.xz)

1 0

ports/opt (3.2): php-gettext: update to 5.6.15
by crux＠crux.nu 05 Nov '15

05 Nov '15

commit 2fd6248ef049fb4de948400877003deddff210ef Author: Juergen Daubert <jue(a)jue.li> Date: Wed Nov 4 17:30:58 2015 +0100 php-gettext: update to 5.6.15 diff --git a/php-gettext/.md5sum b/php-gettext/.md5sum index 0596540..8fa5571 100644 --- a/php-gettext/.md5sum +++ b/php-gettext/.md5sum @@ -1 +1 @@ -05d54cad22f393f4b5b0ec0ab06a2b91 php-5.5.29.tar.xz +c726a86238017c2d9db0171b14d300e7 php-5.6.15.tar.xz diff --git a/php-gettext/Pkgfile b/php-gettext/Pkgfile index e88ae2f..52776a9 100644 --- a/php-gettext/Pkgfile +++ b/php-gettext/Pkgfile @@ -1,10 +1,11 @@ -# Description: Gettext module for PHP -# URL: http://www.php.net -# Maintainer: Alan Mizrahi, alan at mizrahi dot com dot ve -# Depends on: +# Description: Gettext module for PHP +# URL: http://www.php.net +# Maintainer: Juergen Daubert, jue at crux dot nu +# Packager: Alan Mizrahi, alan at mizrahi dot com dot ve +# Depends on: name=php-gettext -version=5.5.29 +version=5.6.15 release=1 source=(http://www.php.net/distributions/php-$version.tar.xz)

1 0

ports/opt (3.2): php-gd: update to 5.6.15
by crux＠crux.nu 05 Nov '15

05 Nov '15

commit 654cba57a828189a66a653985bc85c6f54da5d00 Author: Juergen Daubert <jue(a)jue.li> Date: Wed Nov 4 17:30:47 2015 +0100 php-gd: update to 5.6.15 diff --git a/php-gd/.md5sum b/php-gd/.md5sum index 0596540..8fa5571 100644 --- a/php-gd/.md5sum +++ b/php-gd/.md5sum @@ -1 +1 @@ -05d54cad22f393f4b5b0ec0ab06a2b91 php-5.5.29.tar.xz +c726a86238017c2d9db0171b14d300e7 php-5.6.15.tar.xz diff --git a/php-gd/Pkgfile b/php-gd/Pkgfile index 53ba5fb..99cded2 100644 --- a/php-gd/Pkgfile +++ b/php-gd/Pkgfile @@ -1,10 +1,11 @@ -# Description: GD module for PHP -# URL: http://www.php.net -# Maintainer: Alan Mizrahi, alan at mizrahi dot com dot ve -# Depends on: libgd +# Description: GD module for PHP +# URL: http://www.php.net +# Maintainer: Juergen Daubert, jue at crux dot nu +# Packager: Alan Mizrahi, alan at mizrahi dot com dot ve +# Depends on: libgd name=php-gd -version=5.5.29 +version=5.6.15 release=1 source=(http://www.php.net/distributions/php-$version.tar.xz)

1 0

ports/opt (3.2): php-ftp: update to 5.6.15
by crux＠crux.nu 05 Nov '15

05 Nov '15

commit d452ad0339bce8143702df8d3946c0447e2da2f3 Author: Juergen Daubert <jue(a)jue.li> Date: Wed Nov 4 17:30:33 2015 +0100 php-ftp: update to 5.6.15 diff --git a/php-ftp/.md5sum b/php-ftp/.md5sum index 0596540..8fa5571 100644 --- a/php-ftp/.md5sum +++ b/php-ftp/.md5sum @@ -1 +1 @@ -05d54cad22f393f4b5b0ec0ab06a2b91 php-5.5.29.tar.xz +c726a86238017c2d9db0171b14d300e7 php-5.6.15.tar.xz diff --git a/php-ftp/Pkgfile b/php-ftp/Pkgfile index 30b1a84..a2e6e1e 100644 --- a/php-ftp/Pkgfile +++ b/php-ftp/Pkgfile @@ -1,10 +1,11 @@ -# Description: FTP module for PHP -# URL: http://www.php.net -# Maintainer: Alan Mizrahi, alan at mizrahi dot com dot ve -# Depends on: +# Description: FTP module for PHP +# URL: http://www.php.net +# Maintainer: Juergen Daubert, jue at crux dot nu +# Packager: Alan Mizrahi, alan at mizrahi dot com dot ve +# Depends on: name=php-ftp -version=5.5.29 +version=5.6.15 release=1 source=(http://www.php.net/distributions/php-$version.tar.xz)

1 0

ports/opt (3.2): lua: 5.2.3 -> 5.3.1
by crux＠crux.nu 05 Nov '15

05 Nov '15

commit 71a1d31a7837713034c5885969a19b3afc15c087 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Thu Nov 5 19:11:18 2015 +1100 lua: 5.2.3 -> 5.3.1 diff --git a/lua/.footprint b/lua/.footprint index e7093a9..9b13b7b 100644 --- a/lua/.footprint +++ b/lua/.footprint @@ -1,7 +1,9 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/lua +lrwxrwxrwx root/root usr/bin/lua5.3 -> /usr/bin/lua -rwxr-xr-x root/root usr/bin/luac +lrwxrwxrwx root/root usr/bin/luac5.3 -> /usr/bin/luac drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/lauxlib.h -rw-r--r-- root/root usr/include/lua.h @@ -10,11 +12,10 @@ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/lualib.h drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/liblua.a -lrwxrwxrwx root/root usr/lib/liblua.so -> liblua.so.5.2 -lrwxrwxrwx root/root usr/lib/liblua.so.5.2 -> liblua.so.5.2.3 --rw-r--r-- root/root usr/lib/liblua.so.5.2.3 +-rw-r--r-- root/root usr/lib/liblua.so.5.3 +-rw-r--r-- root/root usr/lib/liblua.so.5.3.1 drwxr-xr-x root/root usr/lib/lua/ -drwxr-xr-x root/root usr/lib/lua/5.2/ +drwxr-xr-x root/root usr/lib/lua/5.3/ drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/lua.pc drwxr-xr-x root/root usr/man/ @@ -23,4 +24,4 @@ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/luac.1.gz drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/lua/ -drwxr-xr-x root/root usr/share/lua/5.2/ +drwxr-xr-x root/root usr/share/lua/5.3/ diff --git a/lua/.md5sum b/lua/.md5sum index 8aead05..fc20c41 100644 --- a/lua/.md5sum +++ b/lua/.md5sum @@ -1,3 +1,3 @@ -bdc663c7b82ffc0b5df67611621fb625 liblua.so.patch -dc7f94ec6ff15c985d2d6ad0f1b35654 lua-5.2.3.tar.gz +85fe4e5f780376457eba3bc23d2cb2d3 liblua.so.patch +797adacada8d85761c079390ff1d9961 lua-5.3.1.tar.gz e7ba6c2b695b0b84a5ea0cbff5fc9067 lua.pc diff --git a/lua/Pkgfile b/lua/Pkgfile index b06a134..3561251 100644 --- a/lua/Pkgfile +++ b/lua/Pkgfile @@ -5,8 +5,8 @@ # Depends on: readline name=lua -version=5.2.3 -release=2 +version=5.3.1 +release=1 source=(http://www.lua.org/ftp/$name-$version.tar.gz liblua.so.patch lua.pc) @@ -14,18 +14,18 @@ build() { cd $name-$version patch -p 1 -i $SRC/liblua.so.patch - export CFLAGS="$CFLAGS -fPIC" + export CFLAGS="$CFLAGS -fPIC -DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1" make MYCFLAGS="$CFLAGS" MYLDFLAGS="$LDFLAGS" linux make \ - TO_LIB="liblua.a liblua.so.$version" \ + TO_LIB="liblua.a liblua.so.${version:0:3} liblua.so.$version" \ INSTALL_TOP=$PKG/usr install - ln -sf liblua.so.$version $PKG/usr/lib/liblua.so.${version:0:3} - ln -sf liblua.so.${version:0:3} $PKG/usr/lib/liblua.so + ln -sf /usr/bin/lua $PKG/usr/bin/lua${version:0:3} + ln -sf /usr/bin/luac $PKG/usr/bin/luac${version:0:3} #make pc > lua.pc - sed "s/%VER%/${version%.*}/g;s/%REL%/$version/g" $SRC/lua.pc > lua.pc + sed "s/%VER%/${version:0:3}/g;s/%REL%/$version/g" $SRC/lua.pc > lua.pc install -m 0644 -D lua.pc $PKG/usr/lib/pkgconfig/lua.pc } diff --git a/lua/liblua.so.patch b/lua/liblua.so.patch index 92c1f3a..f9e24f3 100644 --- a/lua/liblua.so.patch +++ b/lua/liblua.so.patch @@ -1,7 +1,8 @@ -diff -ru lua-5.2.1/Makefile lua-5.2.1.new/Makefile ---- lua-5.2.1/Makefile 2012-05-17 16:05:54.000000000 +0200 -+++ lua-5.2.1.new/Makefile 2012-09-12 22:39:07.162748096 +0200 -@@ -52,7 +52,7 @@ +diff --git a/Makefile b/Makefile +index 7fa91c8..dccf485 100644 +--- a/Makefile ++++ b/Makefile +@@ -52,7 +52,7 @@ R= $V.0 all: $(PLAT) $(PLATS) clean: @@ -10,30 +11,19 @@ diff -ru lua-5.2.1/Makefile lua-5.2.1.new/Makefile test: dummy src/lua -v -diff -ru lua-5.2.1/src/luaconf.h lua-5.2.1.new/src/luaconf.h ---- lua-5.2.1/src/luaconf.h 2012-05-11 16:14:42.000000000 +0200 -+++ lua-5.2.1.new/src/luaconf.h 2012-09-12 22:40:27.986622772 +0200 -@@ -100,7 +100,7 @@ - #else /* }{ */ - - #define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/" --#define LUA_ROOT "/usr/local/" -+#define LUA_ROOT "/usr/" - #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR - #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR - #define LUA_PATH_DEFAULT \ -diff -ru lua-5.2.1/src/Makefile lua-5.2.1.new/src/Makefile ---- lua-5.2.1/src/Makefile 2012-03-09 17:32:16.000000000 +0100 -+++ lua-5.2.1.new/src/Makefile 2012-09-12 22:38:08.591386896 +0200 -@@ -29,6 +29,7 @@ - PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris +diff --git a/src/Makefile b/src/Makefile +index 2e7a412..fa5769f 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -29,6 +29,7 @@ MYOBJS= + PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris LUA_A= liblua.a +LUA_SO= liblua.so CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \ ltm.o lundump.o lvm.o lzio.o -@@ -43,7 +44,7 @@ +@@ -43,7 +44,7 @@ LUAC_T= luac LUAC_O= luac.o ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) @@ -42,7 +32,7 @@ diff -ru lua-5.2.1/src/Makefile lua-5.2.1.new/src/Makefile ALL_A= $(LUA_A) # Targets start here. -@@ -59,6 +60,12 @@ +@@ -59,6 +60,12 @@ $(LUA_A): $(BASE_O) $(AR) $@ $(BASE_O) $(RANLIB) $@ @@ -55,3 +45,16 @@ diff -ru lua-5.2.1/src/Makefile lua-5.2.1.new/src/Makefile $(LUA_T): $(LUA_O) $(LUA_A) $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) +diff --git a/src/luaconf.h b/src/luaconf.h +index fd28d21..e2662cc 100644 +--- a/src/luaconf.h ++++ b/src/luaconf.h +@@ -175,7 +175,7 @@ + + #else /* }{ */ + +-#define LUA_ROOT "/usr/local/" ++#define LUA_ROOT "/usr/" + #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/" + #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/" + #define LUA_PATH_DEFAULT \

1 0

ports/opt (3.2): Merge branch '3.1' into 3.2
by crux＠crux.nu 05 Nov '15

05 Nov '15

commit a436439e78a7f0da1891e1ce064f0a12f3987b21 Merge: 637e169 ddcb2fb Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Fri Nov 6 00:30:28 2015 +0100 Merge branch '3.1' into 3.2

1 0