Merge branch '3.1' into 3.2

This commit is contained in:
Fredrik Rinnestam 2015-07-09 17:41:48 +02:00
commit 1bd992c2be
9 changed files with 16 additions and 16 deletions

View File

@ -1 +1 @@
374fcac1877078a2fc0ef8cd1617a869 dhcpcd-6.9.0.tar.bz2 42df0ef5f8a4b07c28faa56f42d55bab dhcpcd-6.9.1.tar.xz

View File

@ -4,9 +4,9 @@
# Depends on: eudev # Depends on: eudev
name=dhcpcd name=dhcpcd
version=6.9.0 version=6.9.1
release=1 release=1
source=(http://roy.marples.name/downloads/dhcpcd/$name-$version.tar.bz2) source=(http://roy.marples.name/downloads/dhcpcd/$name-$version.tar.xz)
build () { build () {
cd $name-$version cd $name-$version

View File

@ -1,3 +1,3 @@
37efb479b3943b60c449ea02362b5ffc iproute2-4.1.0.tar.xz 39290cb3a55d38dd8d10e19a3094109f iproute2-4.1.1.tar.xz
7b469125cfe2d9916ba03f7c65b9dcd5 lo.iproute2 7b469125cfe2d9916ba03f7c65b9dcd5 lo.iproute2
826848debe693f2e2a3e235ce9abe601 net.iproute2 826848debe693f2e2a3e235ce9abe601 net.iproute2

View File

@ -4,7 +4,7 @@
# Depends on: db iptables # Depends on: db iptables
name=iproute2 name=iproute2
version=4.1.0 version=4.1.1
release=1 release=1
source=(https://www.kernel.org/pub/linux/utils/net/$name/$name-$version.tar.xz \ source=(https://www.kernel.org/pub/linux/utils/net/$name/$name-$version.tar.xz \
lo.iproute2 net.iproute2) lo.iproute2 net.iproute2)
@ -12,10 +12,6 @@ source=(https://www.kernel.org/pub/linux/utils/net/$name/$name-$version.tar.xz \
build() { build() {
cd $name-$version cd $name-$version
# tipc depends on libmnl
rm -r tipc
sed -i '/^SUBDIRS/s/tipc//' Makefile
./configure ./configure
make CCOPTS="$CFLAGS" make CCOPTS="$CFLAGS"
make MANDIR=/usr/man DESTDIR=$PKG install make MANDIR=/usr/man DESTDIR=$PKG install

View File

@ -1 +1 @@
da8d81a6a2ea235025795d9e001a6ae3 LVM2.2.02.124.tgz 2d24ba982c8a85e8c837210f087a6a51 LVM2.2.02.125.tgz

View File

@ -4,12 +4,12 @@
# Depends on: eudev # Depends on: eudev
name=libdevmapper name=libdevmapper
version=1.02.101 version=1.02.102
release=1 release=1
source=(http://mirrors.kernel.org/sources.redhat.com/lvm2/LVM2.2.02.124.tgz) source=(http://mirrors.kernel.org/sources.redhat.com/lvm2/LVM2.2.02.125.tgz)
build() { build() {
cd LVM2.2.02.124 cd LVM2.2.02.125
# needed for static linking with eudev # needed for static linking with eudev
export UDEV_LIBS="$(pkg-config --libs --static libudev)" export UDEV_LIBS="$(pkg-config --libs --static libudev)"

View File

@ -177,7 +177,6 @@ lrwxrwxrwx root/root usr/man/man1/sha512.1ssl.gz -> dgst.1ssl.gz
-rw-r--r-- root/root usr/man/man1/version.1ssl.gz -rw-r--r-- root/root usr/man/man1/version.1ssl.gz
-rw-r--r-- root/root usr/man/man1/x509.1ssl.gz -rw-r--r-- root/root usr/man/man1/x509.1ssl.gz
drwxr-xr-x root/root usr/man/man3/ drwxr-xr-x root/root usr/man/man3/
lrwxrwxrwx root/root usr/man/man3/.3ssl.gz -> SSL_CTX_use_serverinfo.3ssl.gz
lrwxrwxrwx root/root usr/man/man3/ASN1_OBJECT_free.3ssl.gz -> ASN1_OBJECT_new.3ssl.gz lrwxrwxrwx root/root usr/man/man3/ASN1_OBJECT_free.3ssl.gz -> ASN1_OBJECT_new.3ssl.gz
-rw-r--r-- root/root usr/man/man3/ASN1_OBJECT_new.3ssl.gz -rw-r--r-- root/root usr/man/man3/ASN1_OBJECT_new.3ssl.gz
lrwxrwxrwx root/root usr/man/man3/ASN1_STRING_cmp.3ssl.gz -> ASN1_STRING_length.3ssl.gz lrwxrwxrwx root/root usr/man/man3/ASN1_STRING_cmp.3ssl.gz -> ASN1_STRING_length.3ssl.gz
@ -1177,6 +1176,7 @@ lrwxrwxrwx root/root usr/man/man3/SSL_CTX_clear_options.3ssl.gz -> SSL_CTX_set_o
-rw-r--r-- root/root usr/man/man3/SSL_CTX_flush_sessions.3ssl.gz -rw-r--r-- root/root usr/man/man3/SSL_CTX_flush_sessions.3ssl.gz
-rw-r--r-- root/root usr/man/man3/SSL_CTX_free.3ssl.gz -rw-r--r-- root/root usr/man/man3/SSL_CTX_free.3ssl.gz
lrwxrwxrwx root/root usr/man/man3/SSL_CTX_get0_chain_certs.3ssl.gz -> SSL_CTX_add1_chain_cert.3ssl.gz lrwxrwxrwx root/root usr/man/man3/SSL_CTX_get0_chain_certs.3ssl.gz -> SSL_CTX_add1_chain_cert.3ssl.gz
-rw-r--r-- root/root usr/man/man3/SSL_CTX_get0_param.3ssl.gz
lrwxrwxrwx root/root usr/man/man3/SSL_CTX_get_cert_store.3ssl.gz -> SSL_CTX_set_cert_store.3ssl.gz lrwxrwxrwx root/root usr/man/man3/SSL_CTX_get_cert_store.3ssl.gz -> SSL_CTX_set_cert_store.3ssl.gz
lrwxrwxrwx root/root usr/man/man3/SSL_CTX_get_client_CA_list.3ssl.gz -> SSL_get_client_CA_list.3ssl.gz lrwxrwxrwx root/root usr/man/man3/SSL_CTX_get_client_CA_list.3ssl.gz -> SSL_get_client_CA_list.3ssl.gz
lrwxrwxrwx root/root usr/man/man3/SSL_CTX_get_client_cert_cb.3ssl.gz -> SSL_CTX_set_client_cert_cb.3ssl.gz lrwxrwxrwx root/root usr/man/man3/SSL_CTX_get_client_cert_cb.3ssl.gz -> SSL_CTX_set_client_cert_cb.3ssl.gz
@ -1227,6 +1227,7 @@ lrwxrwxrwx root/root usr/man/man3/SSL_CTX_set1_chain.3ssl.gz -> SSL_CTX_add1_cha
lrwxrwxrwx root/root usr/man/man3/SSL_CTX_set1_chain_cert_store.3ssl.gz -> SSL_CTX_set1_verify_cert_store.3ssl.gz lrwxrwxrwx root/root usr/man/man3/SSL_CTX_set1_chain_cert_store.3ssl.gz -> SSL_CTX_set1_verify_cert_store.3ssl.gz
-rw-r--r-- root/root usr/man/man3/SSL_CTX_set1_curves.3ssl.gz -rw-r--r-- root/root usr/man/man3/SSL_CTX_set1_curves.3ssl.gz
lrwxrwxrwx root/root usr/man/man3/SSL_CTX_set1_curves_list.3ssl.gz -> SSL_CTX_set1_curves.3ssl.gz lrwxrwxrwx root/root usr/man/man3/SSL_CTX_set1_curves_list.3ssl.gz -> SSL_CTX_set1_curves.3ssl.gz
lrwxrwxrwx root/root usr/man/man3/SSL_CTX_set1_param.3ssl.gz -> SSL_CTX_get0_param.3ssl.gz
-rw-r--r-- root/root usr/man/man3/SSL_CTX_set1_verify_cert_store.3ssl.gz -rw-r--r-- root/root usr/man/man3/SSL_CTX_set1_verify_cert_store.3ssl.gz
-rw-r--r-- root/root usr/man/man3/SSL_CTX_set_cert_cb.3ssl.gz -rw-r--r-- root/root usr/man/man3/SSL_CTX_set_cert_cb.3ssl.gz
-rw-r--r-- root/root usr/man/man3/SSL_CTX_set_cert_store.3ssl.gz -rw-r--r-- root/root usr/man/man3/SSL_CTX_set_cert_store.3ssl.gz
@ -1275,6 +1276,7 @@ lrwxrwxrwx root/root usr/man/man3/SSL_CTX_use_certificate_chain_file.3ssl.gz ->
lrwxrwxrwx root/root usr/man/man3/SSL_CTX_use_certificate_file.3ssl.gz -> SSL_CTX_use_certificate.3ssl.gz lrwxrwxrwx root/root usr/man/man3/SSL_CTX_use_certificate_file.3ssl.gz -> SSL_CTX_use_certificate.3ssl.gz
-rw-r--r-- root/root usr/man/man3/SSL_CTX_use_psk_identity_hint.3ssl.gz -rw-r--r-- root/root usr/man/man3/SSL_CTX_use_psk_identity_hint.3ssl.gz
-rw-r--r-- root/root usr/man/man3/SSL_CTX_use_serverinfo.3ssl.gz -rw-r--r-- root/root usr/man/man3/SSL_CTX_use_serverinfo.3ssl.gz
lrwxrwxrwx root/root usr/man/man3/SSL_CTX_use_serverinfo_file.3ssl.gz -> SSL_CTX_use_serverinfo.3ssl.gz
-rw-r--r-- root/root usr/man/man3/SSL_SESSION_free.3ssl.gz -rw-r--r-- root/root usr/man/man3/SSL_SESSION_free.3ssl.gz
lrwxrwxrwx root/root usr/man/man3/SSL_SESSION_get_ex_data.3ssl.gz -> SSL_SESSION_get_ex_new_index.3ssl.gz lrwxrwxrwx root/root usr/man/man3/SSL_SESSION_get_ex_data.3ssl.gz -> SSL_SESSION_get_ex_new_index.3ssl.gz
-rw-r--r-- root/root usr/man/man3/SSL_SESSION_get_ex_new_index.3ssl.gz -rw-r--r-- root/root usr/man/man3/SSL_SESSION_get_ex_new_index.3ssl.gz
@ -1304,6 +1306,7 @@ lrwxrwxrwx root/root usr/man/man3/SSL_ctrl.3ssl.gz -> SSL_CTX_ctrl.3ssl.gz
lrwxrwxrwx root/root usr/man/man3/SSL_flush_sessions.3ssl.gz -> SSL_CTX_flush_sessions.3ssl.gz lrwxrwxrwx root/root usr/man/man3/SSL_flush_sessions.3ssl.gz -> SSL_CTX_flush_sessions.3ssl.gz
-rw-r--r-- root/root usr/man/man3/SSL_free.3ssl.gz -rw-r--r-- root/root usr/man/man3/SSL_free.3ssl.gz
lrwxrwxrwx root/root usr/man/man3/SSL_get0_chain_certs.3ssl.gz -> SSL_CTX_add1_chain_cert.3ssl.gz lrwxrwxrwx root/root usr/man/man3/SSL_get0_chain_certs.3ssl.gz -> SSL_CTX_add1_chain_cert.3ssl.gz
lrwxrwxrwx root/root usr/man/man3/SSL_get0_param.3ssl.gz -> SSL_CTX_get0_param.3ssl.gz
lrwxrwxrwx root/root usr/man/man3/SSL_get1_curves.3ssl.gz -> SSL_CTX_set1_curves.3ssl.gz lrwxrwxrwx root/root usr/man/man3/SSL_get1_curves.3ssl.gz -> SSL_CTX_set1_curves.3ssl.gz
-rw-r--r-- root/root usr/man/man3/SSL_get_SSL_CTX.3ssl.gz -rw-r--r-- root/root usr/man/man3/SSL_get_SSL_CTX.3ssl.gz
lrwxrwxrwx root/root usr/man/man3/SSL_get_accept_state.3ssl.gz -> SSL_set_connect_state.3ssl.gz lrwxrwxrwx root/root usr/man/man3/SSL_get_accept_state.3ssl.gz -> SSL_set_connect_state.3ssl.gz
@ -1363,6 +1366,7 @@ lrwxrwxrwx root/root usr/man/man3/SSL_set1_chain.3ssl.gz -> SSL_CTX_add1_chain_c
lrwxrwxrwx root/root usr/man/man3/SSL_set1_chain_cert_store.3ssl.gz -> SSL_CTX_set1_verify_cert_store.3ssl.gz lrwxrwxrwx root/root usr/man/man3/SSL_set1_chain_cert_store.3ssl.gz -> SSL_CTX_set1_verify_cert_store.3ssl.gz
lrwxrwxrwx root/root usr/man/man3/SSL_set1_curves.3ssl.gz -> SSL_CTX_set1_curves.3ssl.gz lrwxrwxrwx root/root usr/man/man3/SSL_set1_curves.3ssl.gz -> SSL_CTX_set1_curves.3ssl.gz
lrwxrwxrwx root/root usr/man/man3/SSL_set1_curves_list.3ssl.gz -> SSL_CTX_set1_curves.3ssl.gz lrwxrwxrwx root/root usr/man/man3/SSL_set1_curves_list.3ssl.gz -> SSL_CTX_set1_curves.3ssl.gz
lrwxrwxrwx root/root usr/man/man3/SSL_set1_param.3ssl.gz -> SSL_CTX_get0_param.3ssl.gz
lrwxrwxrwx root/root usr/man/man3/SSL_set1_verify_cert_store.3ssl.gz -> SSL_CTX_set1_verify_cert_store.3ssl.gz lrwxrwxrwx root/root usr/man/man3/SSL_set1_verify_cert_store.3ssl.gz -> SSL_CTX_set1_verify_cert_store.3ssl.gz
-rw-r--r-- root/root usr/man/man3/SSL_set_bio.3ssl.gz -rw-r--r-- root/root usr/man/man3/SSL_set_bio.3ssl.gz
lrwxrwxrwx root/root usr/man/man3/SSL_set_cert_cb.3ssl.gz -> SSL_CTX_set_cert_cb.3ssl.gz lrwxrwxrwx root/root usr/man/man3/SSL_set_cert_cb.3ssl.gz -> SSL_CTX_set_cert_cb.3ssl.gz

View File

@ -1,2 +1,2 @@
91f85842d2118003ee465c34259047e6 mksslcert.sh 91f85842d2118003ee465c34259047e6 mksslcert.sh
8c8d81a9ae7005276e486702edbcd4b6 openssl-1.0.2c.tar.gz 38dd619b2e77cbac69b99f52a053d25a openssl-1.0.2d.tar.gz

View File

@ -3,7 +3,7 @@
# Maintainer: CRUX System Team, core-ports at crux dot nu # Maintainer: CRUX System Team, core-ports at crux dot nu
name=openssl name=openssl
version=1.0.2c version=1.0.2d
release=1 release=1
source=(http://www.openssl.org/source/$name-$version.tar.gz \ source=(http://www.openssl.org/source/$name-$version.tar.gz \
mksslcert.sh) mksslcert.sh)