Merge branch '3.0' into 3.1

This commit is contained in:
Juergen Daubert 2014-02-20 17:40:43 +01:00
commit ffce465195
10 changed files with 22 additions and 47 deletions

View File

@ -1,2 +1,2 @@
d8e4d8287a76ee861351b905044c8e92 man-pages-3.59.tar.xz
521966926394940028a49b1a428328e8 man-pages-3.60.tar.xz
825fde78e6fddd02426ecdd50e2cbe0d man-pages-posix-2013-a.tar.xz

View File

@ -4,7 +4,7 @@
# Depends on: man
name=man-pages
version=3.59
version=3.60
release=1
source=(http://www.kernel.org/pub/linux/docs/$name/$name-$version.tar.xz \
http://www.kernel.org/pub/linux/docs/$name/$name-posix/$name-posix-2013-a.tar.xz)

View File

@ -1 +1 @@
099d62e48cd6d9b94f89ef430cd8525c nasm-2.11.tar.xz
ec43582b8febae24e5b440ae816120c8 nasm-2.11.02.tar.xz

View File

@ -3,7 +3,7 @@
# Maintainer: CRUX System Team, core-ports at crux dot nu
name=nasm
version=2.11
version=2.11.02
release=1
source=(http://www.nasm.us/pub/nasm/releasebuilds/$version/$name-$version.tar.xz)

View File

@ -11,8 +11,10 @@ drwxr-xr-x root/root usr/include/pppd/
-rw-r--r-- root/root usr/include/pppd/chap_ms.h
-rw-r--r-- root/root usr/include/pppd/eap.h
-rw-r--r-- root/root usr/include/pppd/ecp.h
-rw-r--r-- root/root usr/include/pppd/eui64.h
-rw-r--r-- root/root usr/include/pppd/fsm.h
-rw-r--r-- root/root usr/include/pppd/ipcp.h
-rw-r--r-- root/root usr/include/pppd/ipv6cp.h
-rw-r--r-- root/root usr/include/pppd/ipxcp.h
-rw-r--r-- root/root usr/include/pppd/lcp.h
-rw-r--r-- root/root usr/include/pppd/magic.h
@ -29,16 +31,16 @@ drwxr-xr-x root/root usr/include/pppd/
-rw-r--r-- root/root usr/include/pppd/upap.h
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/pppd/
drwxr-xr-x root/root usr/lib/pppd/2.4.5/
-rwxr-xr-x root/root usr/lib/pppd/2.4.5/minconn.so
-rwxr-xr-x root/root usr/lib/pppd/2.4.5/passprompt.so
-rwxr-xr-x root/root usr/lib/pppd/2.4.5/passwordfd.so
-rwsr-x--- root/root usr/lib/pppd/2.4.5/pppoatm.so
-rwxr-xr-x root/root usr/lib/pppd/2.4.5/radattr.so
-rwxr-xr-x root/root usr/lib/pppd/2.4.5/radius.so
-rwxr-xr-x root/root usr/lib/pppd/2.4.5/radrealms.so
-rwsr-x--- root/root usr/lib/pppd/2.4.5/rp-pppoe.so
-rwxr-xr-x root/root usr/lib/pppd/2.4.5/winbind.so
drwxr-xr-x root/root usr/lib/pppd/2.4.6/
-rwxr-xr-x root/root usr/lib/pppd/2.4.6/minconn.so
-rwxr-xr-x root/root usr/lib/pppd/2.4.6/passprompt.so
-rwxr-xr-x root/root usr/lib/pppd/2.4.6/passwordfd.so
-rwsr-x--- root/root usr/lib/pppd/2.4.6/pppoatm.so
-rwxr-xr-x root/root usr/lib/pppd/2.4.6/radattr.so
-rwxr-xr-x root/root usr/lib/pppd/2.4.6/radius.so
-rwxr-xr-x root/root usr/lib/pppd/2.4.6/radrealms.so
-rwsr-x--- root/root usr/lib/pppd/2.4.6/rp-pppoe.so
-rwxr-xr-x root/root usr/lib/pppd/2.4.6/winbind.so
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man8/
-rw-r--r-- root/root usr/man/man8/chat.8.gz

View File

@ -1,3 +1,2 @@
2176942344ec44bc42390e1a4b73317c ppp-2.4.5-pppol2tp.patch
4621bc56167b6953ec4071043fe0ec57 ppp-2.4.5.tar.gz
3434d2cc9327167a0723aaaa8670083b ppp-2.4.6.tar.gz
24867da3561a2ba62f555ac717af77cb ppp-nofilter.patch

View File

@ -4,15 +4,14 @@
# Depends on: zlib, openssl
name=ppp
version=2.4.5
release=2
version=2.4.6
release=1
source=(http://ppp.samba.org/ftp/ppp/$name-$version.tar.gz \
$name-nofilter.patch $name-$version-pppol2tp.patch)
$name-nofilter.patch)
build () {
cd $name-$version
patch -p1 -i $SRC/$name-nofilter.patch
patch -p1 -i $SRC/$name-$version-pppol2tp.patch
./configure --prefix=/usr --sysconfdir=/etc
make
make -j1 INSTROOT=$PKG install install-etcppp

View File

@ -1,25 +0,0 @@
# https://bugzilla.redhat.com/show_bug.cgi?id=617625
--- ppp-2.4.5/include/linux/if_pppol2tp.h 2009-11-16 22:26:07.000000000 +0000
+++ ppp-2.4.5/include/linux/if_pppol2tp.h 2010-07-16 22:35:22.000000000 +0100
@@ -32,6 +32,20 @@
__u16 d_tunnel, d_session; /* For sending outgoing packets */
};
+/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
+ * bits. So we need a different sockaddr structure.
+ */
+struct pppol2tpv3_addr {
+ pid_t pid; /* pid that owns the fd.
+ * 0 => current */
+ int fd; /* FD of UDP or IP socket to use */
+
+ struct sockaddr_in addr; /* IP address and port to send to */
+
+ __u32 s_tunnel, s_session; /* For matching incoming packets */
+ __u32 d_tunnel, d_session; /* For sending outgoing packets */
+};
+
/* Socket options:
* DEBUG - bitmask of debug message categories
* SENDSEQ - 0 => don't send packets with sequence numbers

View File

@ -1 +1 @@
a25fc99a6dc7fa7ae6e4549be80b401f psmisc-22.20.tar.gz
935c0fd6eb208288262b385fa656f1bf psmisc-22.21.tar.gz

View File

@ -4,7 +4,7 @@
# Depends on: ncurses
name=psmisc
version=22.20
version=22.21
release=1
source=(http://downloads.sourceforge.net/project/$name/$name/$name-$version.tar.gz)