Merge branch '3.1' into 3.2
This commit is contained in:
commit
c6317550bb
@ -152,6 +152,7 @@ drwxr-xr-x root/root usr/man/man3/
|
||||
-rw-r--r-- root/root usr/man/man3/CURLOPT_PASSWORD.3.gz
|
||||
-rw-r--r-- root/root usr/man/man3/CURLOPT_PATH_AS_IS.3.gz
|
||||
-rw-r--r-- root/root usr/man/man3/CURLOPT_PINNEDPUBLICKEY.3.gz
|
||||
-rw-r--r-- root/root usr/man/man3/CURLOPT_PIPEWAIT.3.gz
|
||||
-rw-r--r-- root/root usr/man/man3/CURLOPT_PORT.3.gz
|
||||
-rw-r--r-- root/root usr/man/man3/CURLOPT_POST.3.gz
|
||||
-rw-r--r-- root/root usr/man/man3/CURLOPT_POSTFIELDS.3.gz
|
||||
@ -172,6 +173,7 @@ drwxr-xr-x root/root usr/man/man3/
|
||||
-rw-r--r-- root/root usr/man/man3/CURLOPT_PROXYTYPE.3.gz
|
||||
-rw-r--r-- root/root usr/man/man3/CURLOPT_PROXYUSERNAME.3.gz
|
||||
-rw-r--r-- root/root usr/man/man3/CURLOPT_PROXYUSERPWD.3.gz
|
||||
-rw-r--r-- root/root usr/man/man3/CURLOPT_PROXY_SERVICE_NAME.3.gz
|
||||
-rw-r--r-- root/root usr/man/man3/CURLOPT_PROXY_TRANSFER_MODE.3.gz
|
||||
-rw-r--r-- root/root usr/man/man3/CURLOPT_PUT.3.gz
|
||||
-rw-r--r-- root/root usr/man/man3/CURLOPT_QUOTE.3.gz
|
||||
@ -193,6 +195,7 @@ drwxr-xr-x root/root usr/man/man3/
|
||||
-rw-r--r-- root/root usr/man/man3/CURLOPT_SASL_IR.3.gz
|
||||
-rw-r--r-- root/root usr/man/man3/CURLOPT_SEEKDATA.3.gz
|
||||
-rw-r--r-- root/root usr/man/man3/CURLOPT_SEEKFUNCTION.3.gz
|
||||
-rw-r--r-- root/root usr/man/man3/CURLOPT_SERVICE_NAME.3.gz
|
||||
-rw-r--r-- root/root usr/man/man3/CURLOPT_SHARE.3.gz
|
||||
-rw-r--r-- root/root usr/man/man3/CURLOPT_SOCKOPTDATA.3.gz
|
||||
-rw-r--r-- root/root usr/man/man3/CURLOPT_SOCKOPTFUNCTION.3.gz
|
||||
|
@ -1 +1 @@
|
||||
f1e460020a99da039b153e4bf0cd8600 curl-7.42.1.tar.lzma
|
||||
95df6d1ce9c970289d2997e603d6fd79 curl-7.43.0.tar.lzma
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Depends on: openssl, zlib
|
||||
|
||||
name=curl
|
||||
version=7.42.1
|
||||
version=7.43.0
|
||||
release=1
|
||||
source=(http://curl.haxx.se/download/$name-$version.tar.lzma)
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
ee21e150df6c804eef03a6cb2fc1cceb 81-crux.rules
|
||||
d8d6b2ae5c9a740967b1ae2dccbae95b eudev-3.1.1.tar.gz
|
||||
07ab33fe310d250f06fc28f010e3fde2 eudev-3.1.2.tar.gz
|
||||
ea3abf3fb868f69fa34efa8772ea4e86 eudev-remove_gperf_dep.patch
|
||||
1dcada037857d727e7d1efb5d8777055 keyboard-keys.tar.xz
|
||||
eb80a77a7ea60e8322116791b65ddc5d start_udev
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Depends on: kmod
|
||||
|
||||
name=eudev
|
||||
version=3.1.1
|
||||
version=3.1.2
|
||||
release=1
|
||||
source=(http://dev.gentoo.org/~blueness/$name/$name-$version.tar.gz
|
||||
81-crux.rules start_udev
|
||||
|
@ -1 +1 @@
|
||||
8fb13e5259fe447e02c4a37bc7225add file-5.22.tar.gz
|
||||
61db35209ce71a6d576392ce6e1d2f80 file-5.23.tar.gz
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Depends on: zlib
|
||||
|
||||
name=file
|
||||
version=5.22
|
||||
version=5.23
|
||||
release=1
|
||||
source=(ftp://ftp.astron.com/pub/file/$name-$version.tar.gz)
|
||||
|
||||
|
@ -1 +1 @@
|
||||
1c75d0751a44928b6c4bc81fb16d7fe8 hdparm-9.45.tar.gz
|
||||
213efdbe7471fad3408198918e164354 hdparm-9.48.tar.gz
|
||||
|
@ -3,7 +3,7 @@
|
||||
# Maintainer: CRUX System Team, core-ports at crux dot nu
|
||||
|
||||
name=hdparm
|
||||
version=9.45
|
||||
version=9.48
|
||||
release=1
|
||||
source=(http://downloads.sourceforge.net/project/$name/$name/$name-$version.tar.gz)
|
||||
|
||||
|
@ -1,4 +1,3 @@
|
||||
63afd1bd27e883d1b026d921a4ef2784 ifconfig-default_behaviour.patch
|
||||
87fdb9f85d8fc140b2f873e8e4e18440 inetd
|
||||
dd0d71e008809420edada02dda7a3149 inetd.conf
|
||||
491a75cb382ce3f68122e4556addfcae inetutils-1.9.3.tar.gz
|
||||
04852c26c47cc8c6b825f2b74f191f52 inetutils-1.9.4.tar.gz
|
||||
|
@ -4,17 +4,14 @@
|
||||
# Depends on: readline
|
||||
|
||||
name=inetutils
|
||||
version=1.9.3
|
||||
version=1.9.4
|
||||
release=1
|
||||
source=(http://ftp.gnu.org/gnu/inetutils/inetutils-$version.tar.gz \
|
||||
inetd.conf inetd ifconfig-default_behaviour.patch)
|
||||
inetd.conf inetd)
|
||||
|
||||
build() {
|
||||
cd inetutils-$version
|
||||
|
||||
# http://article.gmane.org/gmane.comp.gnu.inetutils.bugs/3909
|
||||
patch -p1 -i $SRC/ifconfig-default_behaviour.patch
|
||||
|
||||
./configure --prefix=/usr \
|
||||
--libexecdir=/usr/sbin \
|
||||
--mandir=/usr/man \
|
||||
|
@ -1,54 +0,0 @@
|
||||
commit ddfc1fda581f61f5154a9dd5827e49584409ee86
|
||||
Author: Mats Erik Andersson <gnu@gisladisker.se>
|
||||
Date: Sun May 17 00:58:17 2015 +0200
|
||||
|
||||
ifconfig: Regression during interface selection.
|
||||
|
||||
Correctly implement the default behaviour of printing
|
||||
all interfaces in state `UP'. The regression appeared
|
||||
in version 1.9.3 when 32-bit wide flags were implemented.
|
||||
|
||||
diff --git a/ifconfig/printif.c b/ifconfig/printif.c
|
||||
index cc4d7a1..615a630 100644
|
||||
--- a/ifconfig/printif.c
|
||||
+++ b/ifconfig/printif.c
|
||||
@@ -481,22 +481,29 @@ fh_ifdisplay_query (format_data_t form, int argc, char *argv[])
|
||||
int n;
|
||||
|
||||
#ifdef SIOCGIFFLAGS
|
||||
- int f;
|
||||
- int rev;
|
||||
- unsigned int uflags = (unsigned short) form->ifr->ifr_flags;
|
||||
+ /* Request for all, or for a specified interface? */
|
||||
+ n = all_option || ifs_cmdline;
|
||||
+ if (!n)
|
||||
+ {
|
||||
+ /* Otherwise, only interfaces in state `UP' are displayed. */
|
||||
+ int rev = 0;
|
||||
+ int f = if_nameztoflag ("UP", &rev);
|
||||
+
|
||||
+ n = f && ioctl (form->sfd, SIOCGIFFLAGS, form->ifr) == 0;
|
||||
+ if (n) {
|
||||
+ unsigned int uflags = (unsigned short) form->ifr->ifr_flags;
|
||||
|
||||
# ifdef ifr_flagshigh
|
||||
- uflags |= (unsigned short) form->ifr->ifr_flagshigh << 16;
|
||||
+ uflags |= (unsigned short) form->ifr->ifr_flagshigh << 16;
|
||||
# endif /* ifr_flagshigh */
|
||||
|
||||
- n = !(all_option || ifs_cmdline
|
||||
- || ((f = if_nameztoflag ("UP", &rev))
|
||||
- && ioctl (form->sfd, SIOCGIFFLAGS, form->ifr) == 0
|
||||
- && (f & uflags)));
|
||||
+ n = n && (f & uflags);
|
||||
+ };
|
||||
+ }
|
||||
#else
|
||||
- n = 0;
|
||||
+ n = 1; /* Display all of them. */
|
||||
#endif
|
||||
- select_arg (form, argc, argv, n);
|
||||
+ select_arg (form, argc, argv, !n);
|
||||
}
|
||||
|
||||
void
|
@ -1 +1 @@
|
||||
326df8542d3a2376da907e98a0888ccf LVM2.2.02.120.tgz
|
||||
a88bf7d68955635d009a5aec1ffecc48 LVM2.2.02.122.tgz
|
||||
|
@ -4,12 +4,12 @@
|
||||
# Depends on: eudev
|
||||
|
||||
name=libdevmapper
|
||||
version=1.02.97
|
||||
version=1.02.99
|
||||
release=1
|
||||
source=(http://mirrors.kernel.org/sources.redhat.com/lvm2/LVM2.2.02.120.tgz)
|
||||
source=(http://mirrors.kernel.org/sources.redhat.com/lvm2/LVM2.2.02.122.tgz)
|
||||
|
||||
build() {
|
||||
cd LVM2.2.02.120
|
||||
cd LVM2.2.02.122
|
||||
|
||||
# needed for static linking with eudev
|
||||
export UDEV_LIBS="$(pkg-config --libs --static libudev)"
|
||||
|
@ -5,6 +5,6 @@ drwxr-xr-x root/root usr/include/
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
-rw-r--r-- root/root usr/lib/libmpfr.a
|
||||
-rwxr-xr-x root/root usr/lib/libmpfr.la
|
||||
lrwxrwxrwx root/root usr/lib/libmpfr.so -> libmpfr.so.4.1.2
|
||||
lrwxrwxrwx root/root usr/lib/libmpfr.so.4 -> libmpfr.so.4.1.2
|
||||
-rwxr-xr-x root/root usr/lib/libmpfr.so.4.1.2
|
||||
lrwxrwxrwx root/root usr/lib/libmpfr.so -> libmpfr.so.4.1.3
|
||||
lrwxrwxrwx root/root usr/lib/libmpfr.so.4 -> libmpfr.so.4.1.3
|
||||
-rwxr-xr-x root/root usr/lib/libmpfr.so.4.1.3
|
||||
|
@ -1,2 +1 @@
|
||||
65a52494d686cfb02d277dabd7ce6cbb libmpfr-3.1.2-p11.patch.gz
|
||||
e3d203d188b8fe60bb6578dd3152e05c mpfr-3.1.2.tar.xz
|
||||
6969398cd2fbc56a6af570b5273c56a9 mpfr-3.1.3.tar.xz
|
||||
|
@ -4,14 +4,12 @@
|
||||
# Depends on: libgmp
|
||||
|
||||
name=libmpfr
|
||||
version=3.1.2-p11
|
||||
version=3.1.3
|
||||
release=1
|
||||
source=(http://www.mpfr.org/mpfr-${version%-*}/mpfr-${version%-*}.tar.xz
|
||||
$name-$version.patch.gz)
|
||||
source=(http://www.mpfr.org/mpfr-${version%-*}/mpfr-${version%-*}.tar.xz)
|
||||
|
||||
build() {
|
||||
cd mpfr-${version%-*}
|
||||
gunzip -c $SRC/$name-$version.patch.gz | patch -p1
|
||||
./configure --prefix=/usr
|
||||
make
|
||||
make DESTDIR=$PKG install
|
||||
|
Binary file not shown.
@ -1151,6 +1151,7 @@ lrwxrwxrwx root/root usr/man/man3/SSL_CIPHER_get_bits.3ssl.gz -> SSL_CIPHER_get_
|
||||
-rw-r--r-- root/root usr/man/man3/SSL_CIPHER_get_name.3ssl.gz
|
||||
lrwxrwxrwx root/root usr/man/man3/SSL_CIPHER_get_version.3ssl.gz -> SSL_CIPHER_get_name.3ssl.gz
|
||||
-rw-r--r-- root/root usr/man/man3/SSL_COMP_add_compression_method.3ssl.gz
|
||||
lrwxrwxrwx root/root usr/man/man3/SSL_COMP_free_compression_methods.3ssl.gz -> SSL_COMP_add_compression_method.3ssl.gz
|
||||
lrwxrwxrwx root/root usr/man/man3/SSL_CONF_CTX_clear_flags.3ssl.gz -> SSL_CONF_CTX_set_flags.3ssl.gz
|
||||
lrwxrwxrwx root/root usr/man/man3/SSL_CONF_CTX_free.3ssl.gz -> SSL_CONF_CTX_new.3ssl.gz
|
||||
-rw-r--r-- root/root usr/man/man3/SSL_CONF_CTX_new.3ssl.gz
|
||||
|
@ -1,2 +1,2 @@
|
||||
91f85842d2118003ee465c34259047e6 mksslcert.sh
|
||||
a06c547dac9044161a477211049f60ef openssl-1.0.2a.tar.gz
|
||||
8c8d81a9ae7005276e486702edbcd4b6 openssl-1.0.2c.tar.gz
|
||||
|
@ -3,7 +3,7 @@
|
||||
# Maintainer: CRUX System Team, core-ports at crux dot nu
|
||||
|
||||
name=openssl
|
||||
version=1.0.2a
|
||||
version=1.0.2c
|
||||
release=1
|
||||
source=(http://www.openssl.org/source/$name-$version.tar.gz \
|
||||
mksslcert.sh)
|
||||
|
@ -1,3 +1,3 @@
|
||||
f0853a46b3f2da621c293094614cda35 tzcode-makefile.patch
|
||||
4008a3abc025a398697b2587c48258b9 tzcode2015d.tar.gz
|
||||
b595bdc4474b8fc1a15cffc67c66025b tzdata2015d.tar.gz
|
||||
8ca536799e2200fe8d9998c4f71023de tzcode-makefile.patch
|
||||
fb62eb6daf3ddb8c41fd40be05ec657e tzcode2015e.tar.gz
|
||||
36f9056efb432ca945c73397acfce0d4 tzdata2015e.tar.gz
|
||||
|
@ -3,7 +3,7 @@
|
||||
# Maintainer: CRUX System Team, core-ports at crux dot nu
|
||||
|
||||
name=tzdata
|
||||
version=2015d
|
||||
version=2015e
|
||||
release=1
|
||||
source=(http://www.iana.org/time-zones/repository/releases/$name$version.tar.gz
|
||||
http://www.iana.org/time-zones/repository/releases/tzcode$version.tar.gz
|
||||
|
@ -9,9 +9,9 @@
|
||||
# - Install leaps zoneinfo into zoneinfo/right/ ala glibc
|
||||
|
||||
|
||||
diff -Nru tzcode.orig/Makefile tzcode/Makefile
|
||||
--- tzcode.orig/Makefile 2015-01-31 17:37:01.947465597 +0100
|
||||
+++ tzcode/Makefile 2015-01-31 17:38:14.141517183 +0100
|
||||
diff -Nru tzcode.org/Makefile tzcode/Makefile
|
||||
--- tzcode.org/Makefile 2015-06-15 12:23:54.796056136 +0200
|
||||
+++ tzcode/Makefile 2015-06-15 12:24:08.705558291 +0200
|
||||
@@ -44,21 +44,21 @@
|
||||
|
||||
# Everything gets put in subdirectories of. . .
|
||||
@ -37,9 +37,9 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile
|
||||
|
||||
# If you "make INSTALL", the "date" command gets installed in. . .
|
||||
|
||||
@@ -322,8 +322,10 @@
|
||||
@@ -326,8 +326,10 @@
|
||||
|
||||
###############################################################################
|
||||
#MAKE= make
|
||||
|
||||
-cc= cc
|
||||
-CC= $(cc) -DTZDIR=\"$(TZDIR)\"
|
||||
@ -50,8 +50,8 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile
|
||||
|
||||
AR= ar
|
||||
|
||||
@@ -373,19 +375,18 @@
|
||||
ALL: all date
|
||||
@@ -377,19 +379,18 @@
|
||||
ALL: all date $(ENCHILADA)
|
||||
|
||||
install: all $(DATA) $(REDO) $(MANS)
|
||||
- mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \
|
||||
@ -74,7 +74,7 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile
|
||||
|
||||
INSTALL: ALL install date.1
|
||||
mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
|
||||
@@ -428,19 +429,17 @@
|
||||
@@ -432,19 +433,17 @@
|
||||
# You must replace all of $(TZDIR) to switch from not using leap seconds
|
||||
# to using them, or vice versa.
|
||||
right_posix: right_only leapseconds
|
||||
@ -99,7 +99,7 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile
|
||||
-L leapseconds $(TDATA)
|
||||
|
||||
posix_packrat: posix_only backzone
|
||||
@@ -469,7 +468,7 @@
|
||||
@@ -473,7 +472,7 @@
|
||||
chmod +x $@
|
||||
|
||||
check: check_character_set check_white_space check_links check_sorted \
|
||||
|
Loading…
Reference in New Issue
Block a user