diff options
| author | Andrew Manison <amanison@anselsystems.com> | 2011-12-26 23:40:47 +0000 |
|---|---|---|
| committer | Andrew Manison <amanison@anselsystems.com> | 2011-12-26 23:40:47 +0000 |
| commit | 16ba622102626a1a16320ff20ebe586a8369056c (patch) | |
| tree | c5d39d98c37daad17ca085fafa54ca3cdc488fc7 /main | |
| parent | a9fef479eb56b8bc7f984e3998c6bdc55ed340ed (diff) | |
| parent | 75739ae4c45f3868da646ab7527c0d2025fefbd1 (diff) | |
| download | aports-16ba622102626a1a16320ff20ebe586a8369056c.tar.bz2 aports-16ba622102626a1a16320ff20ebe586a8369056c.tar.xz | |
Merge remote-tracking branch 'alpine/master'
Diffstat (limited to 'main')
116 files changed, 3643 insertions, 2925 deletions
diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD index b6bb6e6b4b..e6419e228a 100644 --- a/main/asterisk/APKBUILD +++ b/main/asterisk/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=asterisk pkgver=10.0.0 -pkgrel=0 +pkgrel=2 pkgdesc="Asterisk: A Module Open Source PBX System" url="http://www.asterisk.org/" arch="all" @@ -24,6 +24,7 @@ source="http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-$ ASTERISK-18977.patch ASTERISK-18994.patch ASTERISK-18995.patch + ASTERISK-19106.patch asterisk.initd asterisk.confd asterisk.logrotate" @@ -171,6 +172,7 @@ da5a3c500192dee4275aae5235d25f97 ASTERISK-18976.patch 1ddadef41aa7120e168738b6f3ed8917 ASTERISK-18977.patch 0af5e797f0a99d0f81f95e3710baf5b6 ASTERISK-18994.patch bc6713f5434e07b79d3afdd155461d72 ASTERISK-18995.patch -0ce3219e05f55af884a7dc6b99c2b276 asterisk.initd +fee11ba2f6518462ea6dde4039f9d8fa ASTERISK-19106.patch +86c7589e906102869d67f7f8bc82ca4b asterisk.initd ed31d7ba37bcf8b0346dcf8593c395f0 asterisk.confd 3e65172275684373e1a25c8a11224411 asterisk.logrotate" diff --git a/main/asterisk/ASTERISK-19106.patch b/main/asterisk/ASTERISK-19106.patch new file mode 100644 index 0000000000..d2f44c1d93 --- /dev/null +++ b/main/asterisk/ASTERISK-19106.patch @@ -0,0 +1,40 @@ +diff --git a/channels/chan_sip.c b/channels/chan_sip.c +index e7b678b..f1e5578 100644 +--- a/channels/chan_sip.c ++++ b/channels/chan_sip.c +@@ -13062,17 +13062,8 @@ static int sip_reg_timeout(const void *data) + } + + if (r->dnsmgr) { +- struct sip_peer *peer; + /* If the registration has timed out, maybe the IP changed. Force a refresh. */ + ast_dnsmgr_refresh(r->dnsmgr); +- /* If we are resolving a peer, we have to make sure the refreshed address gets copied */ +- if ((peer = sip_find_peer(r->hostname, NULL, TRUE, FINDPEERS, FALSE, 0))) { +- ast_sockaddr_copy(&peer->addr, &r->us); +- if (r->portno) { +- ast_sockaddr_set_port(&peer->addr, r->portno); +- } +- peer = sip_unref_peer(peer, "unref after sip_find_peer"); +- } + } + + /* If the initial tranmission failed, we may not have an existing dialog, +@@ -13187,14 +13178,14 @@ static int transmit_register(struct sip_registry *r, int sipmethod, const char * + } + + /* Use port number specified if no SRV record was found */ +- if (!ast_sockaddr_port(&r->us) && r->portno) { +- ast_sockaddr_set_port(&r->us, r->portno); ++ if (!ast_sockaddr_port(&r->us)) { ++ ast_sockaddr_set_port(&r->us, r->portno ? r->portno : STANDARD_SIP_PORT); + } + + /* It is possible that DNS is unavailable at the time the peer is created. Here, if + * we've updated the address in the registry, we copy it to the peer so that + * create_addr() can copy it to the dialog via create_addr_from_peer */ +- if ((peer = sip_find_peer(r->hostname, NULL, TRUE, FINDPEERS, FALSE, 0))) { ++ if ((peer = sip_find_peer(S_OR(r->peername, r->hostname), NULL, TRUE, FINDPEERS, FALSE, 0))) { + if (ast_sockaddr_isnull(&peer->addr) && !(ast_sockaddr_isnull(&r->us))) { + ast_sockaddr_copy(&peer->addr, &r->us); + } diff --git a/main/asterisk/asterisk.initd b/main/asterisk/asterisk.initd index 284898ae22..b9806a750e 100644 --- a/main/asterisk/asterisk.initd +++ b/main/asterisk/asterisk.initd @@ -242,8 +242,8 @@ stop() { reload() { if is_running; then - ebegin "Forcing asterisk to reload configuration" - /usr/sbin/asterisk -r -x "modules reload" &>/dev/null + ebegin "Reloading asterisk configuration" + /usr/sbin/asterisk -r -x "core reload" &>/dev/null eend $? else eerror "Asterisk is not running!" diff --git a/main/audacious-plugins/APKBUILD b/main/audacious-plugins/APKBUILD index 079ab8ccfc..7eaf2765a7 100644 --- a/main/audacious-plugins/APKBUILD +++ b/main/audacious-plugins/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=audacious-plugins pkgver=3.1.1 -pkgrel=0 +pkgrel=1 pkgdesc="playlist-oriented media player with multiple interfaces (plugins)" url="http://audacious-media-player.org/" arch="all" diff --git a/main/augeas/APKBUILD b/main/augeas/APKBUILD index de3cceda18..39b481211d 100644 --- a/main/augeas/APKBUILD +++ b/main/augeas/APKBUILD @@ -1,21 +1,26 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=augeas -pkgver=0.9.0 +pkgver=0.10.0 pkgrel=0 pkgdesc="a configuration editing tool" url="http://augeas.net" arch="all" license="LGPL" depends= -makedepends="readline-dev" +makedepends="readline-dev libxml2-dev" install= subpackages="$pkgname-dev $pkgname-doc $pkgname-tests" -source="http://augeas.net/download/augeas-$pkgver.tar.gz" +source="http://augeas.net/download/augeas-$pkgver.tar.gz + regexp.c.patch" _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" - # apply patches here + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done } build() { @@ -39,4 +44,5 @@ tests() { mv "$pkgdir"/usr/share/augeas/lenses/dist/tests \ "$subpkgdir"/usr/share/augeas/lenses/dist/ } -md5sums="5ef0ce53ce4c75f59ab2523506731084 augeas-0.9.0.tar.gz" +md5sums="fe1834e90a066c3208ac0214622c7352 augeas-0.10.0.tar.gz +a9f0fe2cd7e6aebf916747207cc2b537 regexp.c.patch" diff --git a/main/augeas/regexp.c.patch b/main/augeas/regexp.c.patch new file mode 100644 index 0000000000..87ba795ba6 --- /dev/null +++ b/main/augeas/regexp.c.patch @@ -0,0 +1,15 @@ +X-Git-Url: http://git.fedorahosted.org/git?p=augeas.git;a=blobdiff_plain;f=src%2Fregexp.c;h=811087d8f2de1d7adc80b4d9308dc7c9f3827c99;hp=cf0ea5d37e21bed27295bd788fc474ba900a910d;hb=021ea39f8e400225e2d01b4c62eb9d56404f2ecd;hpb=1d5b19760d4d92153a8eb9279bf9709b7ead20c7 + +diff --git a/src/regexp.c b/src/regexp.c +index cf0ea5d..811087d 100644 +--- a/src/regexp.c ++++ b/src/regexp.c +@@ -50,7 +50,7 @@ char *regexp_escape(const struct regexp *r) { + ret = fa_restrict_alphabet(r->pattern->str, strlen(r->pattern->str), + &nre, &nre_len, 2, 1); + if (ret == 0) { +- pat = escape(nre, nre_len); ++ pat = escape(nre, nre_len, RX_ESCAPES); + free(nre); + } + #endif diff --git a/main/automake/APKBUILD b/main/automake/APKBUILD index 262d1caaa3..7727bfe82c 100644 --- a/main/automake/APKBUILD +++ b/main/automake/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=automake -pkgver=1.11.1 +pkgver=1.11.2 pkgrel=0 pkgdesc="A GNU tool for automatically creating Makefiles" arch="noarch" @@ -22,4 +22,4 @@ package() { make DESTDIR=$pkgdir install } -md5sums="4ee7f0ff5f0e467d58b6bd5da96b1c74 automake-1.11.1.tar.gz" +md5sums="79ad64a9f6e83ea98d6964cef8d8a0bc automake-1.11.2.tar.gz" diff --git a/main/babl/APKBUILD b/main/babl/APKBUILD index 358a89a98d..9c82a2b2fe 100644 --- a/main/babl/APKBUILD +++ b/main/babl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=babl -pkgver=0.1.4 -pkgrel=1 +pkgver=0.1.6 +pkgrel=0 pkgdesc="Dynamic, any to any, pixel format conversion library" url="http://gegl.org/babl/" arch="all" @@ -23,4 +23,4 @@ package() { rm "$pkgdir"/usr/lib/babl*/*.la \ "$pkgdir"/usr/lib/*.la || return 1 } -md5sums="1deaf8188b200b10d98a343a7e712b2b babl-0.1.4.tar.bz2" +md5sums="dc960981a5ec5330fc1c177be9f59068 babl-0.1.6.tar.bz2" diff --git a/main/boost/APKBUILD b/main/boost/APKBUILD index 3560977b83..a8bb926bf0 100644 --- a/main/boost/APKBUILD +++ b/main/boost/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=boost -pkgver=1.47.0 +pkgver=1.48.0 _x=${pkgver%%.*} # strip .y.z _y=${pkgver%.*} # strip .z @@ -133,4 +133,4 @@ wave() { _mvlib wave; } wserialization() { _mvlib wserialization; } -md5sums="ff180a5276bec773a7625cac7e2288e8 boost_1_47_0.tar.gz" +md5sums="313a11e97eb56eb7efd18325354631be boost_1_48_0.tar.gz" diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index 1e5045fc6e..88c11a30c1 100644 --- a/main/busybox/APKBUILD +++ b/main/busybox/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=busybox pkgver=1.19.3 -pkgrel=0 +pkgrel=1 _bbsuidver=0.6 pkgdesc="Size optimized toolbox of many common UNIX utilities" url=http://busybox.net @@ -20,6 +20,7 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2 http://busybox.net/downloads/fixes-1.19.3/busybox-1.19.3-getty.patch http://busybox.net/downloads/fixes-1.19.3/busybox-1.19.3-modinfo.patch + http://busybox.net/downloads/fixes-1.19.3/busybox-1.19.3-wget.patch busyboxconfig" @@ -90,4 +91,5 @@ b5375210f13fd6e1ca61a565e8fabd35 busybox-uname-is-not-gnu.patch 784383013b8f015fb0d214618c46b4b8 0001-loginutils-use-sha512.patch 5ed72ca85b8fba4598d64a550210b31f busybox-1.19.3-getty.patch 41636628e481f22b8774b6bee1eebfb1 busybox-1.19.3-modinfo.patch +cb48bffc0e1e3be527cd4ff67324a2a2 busybox-1.19.3-wget.patch 453614d903ed3f39aa0a4b78f94bc7a5 busyboxconfig" diff --git a/main/ca-certificates/APKBUILD b/main/ca-certificates/APKBUILD index 6b345096d7..2e651df86e 100644 --- a/main/ca-certificates/APKBUILD +++ b/main/ca-certificates/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ca-certificates -pkgver=20111025 +pkgver=20111211 _date=${pkgver%_p*} _nmu="+nmu${pkgver#*_p}" [ "$_nmu" = "+nmu${pkgver}" ] && _nmu="" _ver=${_date}${_nmu} -pkgrel=1 +pkgrel=0 pkgdesc="Common CA certificates PEM files" url="http://packages.debian.org/sid/ca-certificates" arch="noarch" @@ -43,4 +43,4 @@ package() { find . -name '*.crt' | sort | cut -b3- ) > "$pkgdir"/etc/ca-certificates.conf } -md5sums="dfd593c9f89e64351aae78b9be588696 ca-certificates_20111025.tar.gz" +md5sums="f99a90a91b23338b4df765c0d18eba73 ca-certificates_20111211.tar.gz" diff --git a/main/claws-mail/APKBUILD b/main/claws-mail/APKBUILD index 7480590af6..0fddbf46b5 100644 --- a/main/claws-mail/APKBUILD +++ b/main/claws-mail/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=claws-mail -pkgver=3.7.10 +pkgver=3.8.0 pkgrel=0 pkgdesc="A GTK+ based e-mail client." url="http://www.claws-mail.org" arch="all" license="GPL3" -subpackages="$pkgname-dev $pkgname-doc" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" makedepends="gtk+-dev openssl-dev startup-notification-dev enchant-dev libsm-dev gnutls-dev curl-dev dbus-glib-dev libetpan-dev openldap-dev" depends= @@ -56,5 +56,5 @@ package() { install -D -m755 ${i} "$pkgdir"/usr/lib/claws-mail/tools/${i} done } -md5sums="fcf58dcff52f0908ff3bc368d820408b claws-mail-3.7.10.tar.bz2 +md5sums="df9f1657d7f34959a2205344d952c2e3 claws-mail-3.8.0.tar.bz2 f3416743b5d8ff97b5a3cc2f7efc2dc1 libc-version.patch" diff --git a/main/dahdi-linux-grsec/APKBUILD b/main/dahdi-linux-grsec/APKBUILD index 2299202a21..a846d197ba 100644 --- a/main/dahdi-linux-grsec/APKBUILD +++ b/main/dahdi-linux-grsec/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Timo Teras <timo.teras@iki.fi> _flavor=grsec -_kver=3.0.12 -_kpkgrel=2 +_kver=3.0.14 +_kpkgrel=0 _mypkgrel=0 # verify the kernel version before entering chroot diff --git a/main/dahdi-linux-vserver/APKBUILD b/main/dahdi-linux-vserver/APKBUILD index c26cd6cf6b..ff010f92ce 100644 --- a/main/dahdi-linux-vserver/APKBUILD +++ b/main/dahdi-linux-vserver/APKBUILD @@ -4,8 +4,8 @@ _flavor=${FLAVOR:-vserver} _realname=dahdi-linux _name=$_realname-$_flavor -_kver=3.0.10 -_kpkgrel=1 +_kver=3.0.14 +_kpkgrel=0 _myvsver=vs2.3.2.1 # verify the kernel version before entering chroot diff --git a/main/fakeroot/APKBUILD b/main/fakeroot/APKBUILD index 547bc5c916..8fb54da738 100644 --- a/main/fakeroot/APKBUILD +++ b/main/fakeroot/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=fakeroot -pkgver=1.18.1 +pkgver=1.18.2 pkgrel=0 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user" arch="all" @@ -32,5 +32,5 @@ package() { rm "$pkgdir"/usr/lib/*.la } -md5sums="8eedda3dcb71b6ab6f62297b82ae5ac6 fakeroot_1.18.1.orig.tar.bz2 +md5sums="79f32331358ad58499704ea5e19fd0ae fakeroot_1.18.2.orig.tar.bz2 bdbf1db14f2cfdff0f5b4c35da78b9fe busybox-getopt.patch" diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD index 258971bff0..fd82922a3a 100644 --- a/main/ffmpeg/APKBUILD +++ b/main/ffmpeg/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ffmpeg -pkgver=0.8.7 +pkgver=0.9 pkgrel=0 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" url="http://ffmpeg.org/" @@ -59,5 +59,5 @@ package() { install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart" || return 1 # strip --strip-debug "$pkgdir"/usr/lib/*.a || return 1 } -md5sums="31da4d5610d7138761e23fab8fe3a84d ffmpeg-0.8.7.tar.bz2 +md5sums="795058de6fc432aa11271408273a0535 ffmpeg-0.9.tar.bz2 2cdc11a99bf97c63c7cca27b073cb47c configure-dlvsym.patch" diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD index 70ae9ea6db..ce50947688 100644 --- a/main/gcc/APKBUILD +++ b/main/gcc/APKBUILD @@ -7,7 +7,7 @@ _specs_gcc_ver=4.4.3 _uclibc_abiver=0.9.32 -pkgrel=3 +pkgrel=4 pkgdesc="The GNU Compiler Collection" url="http://gcc.gnu.org" arch="all" @@ -228,7 +228,8 @@ package() { "$pkdir"/usr/lib/libgcj.spec # remove ffi - rm "$pkgdir"/usr/lib/libffi* + rm "$pkgdir"/usr/lib/libffi* "$pkgdir"/usr/share/man/man3/ffi* \ + || return 1 find "$pkgdir" -name 'ffi*.h' | xargs rm -f mkdir -p "$pkgdir"/usr/share/gdb/python/auto-load/usr/lib diff --git a/main/gegl/APKBUILD b/main/gegl/APKBUILD index b5f936069d..7af93d6973 100644 --- a/main/gegl/APKBUILD +++ b/main/gegl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gegl -pkgver=0.1.6 -pkgrel=1 +pkgver=0.1.8 +pkgrel=0 pkgdesc="Graph based image processing framework" url="http://www.gegl.org/" arch="all" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 find "$pkgdir" -name '*.la' -delete } -md5sums="af5e5a7d3c7ddfaa2b3414de2a7e9113 gegl-0.1.6.tar.bz2" +md5sums="c8279b86b3d584ee4f503839fc500425 gegl-0.1.8.tar.bz2" diff --git a/main/git/APKBUILD b/main/git/APKBUILD index 2a3213b0ab..3e9ab632e4 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=git -pkgver=1.7.8 +pkgver=1.7.8.1 pkgrel=0 pkgdesc="GIT - the stupid content tracker" url="http://git.or.cz/" @@ -52,7 +52,7 @@ perl() { } -md5sums="4a3c03a04dbb857ecc875dae1278b76e git-1.7.8.tar.gz +md5sums="617fe0301390e98cfc5d665b2702254a git-1.7.8.1.tar.gz e63a201556c4f089de790805c09a2e5b bb-tar.patch 3f0bdf6ca73bf4f015bc8565ab787969 git-daemon.initd 2258e95d389ccc6de0b5111d53d9eed6 git-daemon.confd" diff --git a/main/gst-ffmpeg/APKBUILD b/main/gst-ffmpeg/APKBUILD index 090b036855..4fcce7a847 100644 --- a/main/gst-ffmpeg/APKBUILD +++ b/main/gst-ffmpeg/APKBUILD @@ -1,14 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gst-ffmpeg -pkgver=0.10.11 -pkgrel=3 +pkgver=0.10.13 +pkgrel=0 pkgdesc="Gstreamer FFMpeg Plugin" url="http://www.gstreamer.net" arch="all" license="GPL" makedepends="gstreamer-dev gst-plugins-base-dev liboil-dev coreutils orc-dev" -source="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-$pkgver.tar.bz2 - pic.patch" +source="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-$pkgver.tar.bz2" _builddir="$srcdir"/gst-ffmpeg-$pkgver prepare() { @@ -25,6 +24,7 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ + --enable-orc \ --with-ffmpeg-extra-configure="--enable-pic --disable-mmx --disable-mmx2" || return 1 make || return 1 } @@ -36,5 +36,4 @@ package() { | xargs rm -f } -md5sums="0d23197ba7ac06ea34fa66d38469ebe5 gst-ffmpeg-0.10.11.tar.bz2 -154fa474ee135ff709bc76a761477da4 pic.patch" +md5sums="7f5beacaf1312db2db30a026b36888c4 gst-ffmpeg-0.10.13.tar.bz2" diff --git a/main/gst-ffmpeg/pic.patch b/main/gst-ffmpeg/pic.patch deleted file mode 100644 index 3a7268e61b..0000000000 --- a/main/gst-ffmpeg/pic.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./gst-libs/ext/ffmpeg/libswscale/rgb2rgb.c.orig -+++ ./gst-libs/ext/ffmpeg/libswscale/rgb2rgb.c -@@ -159,7 +159,7 @@ - #define RENAME(a) a ## _C - #include "rgb2rgb_template.c" - --#if ARCH_X86 -+#if ARCH_X86 && !defined(PIC) - - //MMX versions - #undef RENAME diff --git a/main/gst-plugins-ugly/APKBUILD b/main/gst-plugins-ugly/APKBUILD index 5f62c1b0ec..3cfb90ed68 100644 --- a/main/gst-plugins-ugly/APKBUILD +++ b/main/gst-plugins-ugly/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gst-plugins-ugly pkgver=0.10.18 -pkgrel=3 +pkgrel=4 pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)" url="http://gstreamer.freedesktop.org/" arch="all" @@ -11,6 +11,7 @@ makedepends="pkgconfig lame-dev libmpeg2-dev a52dec-dev libid3tag-dev libmad-dev glib-dev liboil-dev gstreamer-dev gst-plugins-base-dev x264-dev libcdio-dev libid3tag-dev orc-dev" source="http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-$pkgver.tar.bz2" +subpackages="$pkgname-lang" _builddir="$srcdir"/$pkgname-$pkgver diff --git a/main/gtk+3.0/APKBUILD b/main/gtk+3.0/APKBUILD index e428a0c0e0..4d2b7dba92 100644 --- a/main/gtk+3.0/APKBUILD +++ b/main/gtk+3.0/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gtk+3.0 -pkgver=3.2.2 +pkgver=3.2.3 pkgrel=0 pkgdesc="The GTK+ Toolkit (v3)" url="http://www.gtk.org/" @@ -42,7 +42,7 @@ makedepends="pkgconfig pango-dev tiff-dev zlib-dev" -source="http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.bz2" +source="http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz" depends_dev="atk-dev pango-dev cairo-dev glib-dev intltool gdk-pixbuf-dev" @@ -67,4 +67,4 @@ package() { find "$pkgdir" -name *.la -delete } -md5sums="afc3a739d6ff39d3b81cf69119833c46 gtk+-3.2.2.tar.bz2" +md5sums="b4edcc69e39159dd7be17828249afb46 gtk+-3.2.3.tar.xz" diff --git a/main/imagemagick/APKBUILD b/main/imagemagick/APKBUILD index cd6766e69c..9966e44625 100644 --- a/main/imagemagick/APKBUILD +++ b/main/imagemagick/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=imagemagick -pkgver=6.7.3.9 +pkgver=6.7.4.0 _pkgver=${pkgver%.*}-${pkgver##*.} pkgrel=0 pkgdesc="A collection of tools and libraries for many image formats" @@ -57,4 +57,4 @@ _cxx() { mv "$pkgdir"/usr/lib/libMagick++.so.* "$subpkgdir"/usr/lib/ } -md5sums="a71452f19ece3c36e2eee090c0d317ef ImageMagick-6.7.3-9.tar.gz" +md5sums="9fb18164dd136fafea08e7e4124690a3 ImageMagick-6.7.4-0.tar.gz" diff --git a/main/iscsitarget-grsec/APKBUILD b/main/iscsitarget-grsec/APKBUILD deleted file mode 100644 index 882f81735b..0000000000 --- a/main/iscsitarget-grsec/APKBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> - -_flavor=${FLAVOR:-grsec} -_realname=iscsitarget -# source the kernel version -if [ -f ../linux-$_flavor/APKBUILD ]; then - . ../linux-$_flavor/APKBUILD -fi -_kver=$pkgver -_kernelver=$pkgver-r$pkgrel -_abi_release=$pkgver-${_flavor} -_kpkgrel=$pkgrel - -_iscsiver=1.4.20.2 - -pkgname=${_realname}-${_flavor} -pkgver=$_kver -_mypkgrel=0 -pkgrel=$(($_kpkgrel + $_mypkgrel)) -pkgdesc="$_flavor kernel modules for iscsitarget $_iscsiver" -url="http://iscsitarget.sourceforge.net/" -arch="" -license="GPL-2" -depends="linux-${_flavor}=${_kernelver}" -install= -makedepends="linux-${_flavor}-dev=${_kernelver}" -subpackages= -source="http://downloads.sourceforge.net/$_realname/$_realname-$_iscsiver.tar.gz - iscsitarget-2.6.36.patch - iscsitarget-2.6.37.patch - iscsitarget-2.6.38.patch - " -_ksrc=/usr/src/linux-headers-${_abi_release} - -prepare() { - cd "$srcdir"/$_realname-$_iscsiver - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done -} - -build() { - cd "$srcdir"/$_realname-$_iscsiver - unset ARCH - export GCC_SPECS=/usr/share/gcc/hardenednopie.specs - make -j1 KSRC="$_ksrc" kernel || return 1 -} - -package() { - cd "$srcdir"/$_realname-$_iscsiver - make KSRC="$_ksrc" DESTDIR="$pkgdir" install-kernel || return 1 -} - -md5sums="2f23c0bfe124d79f5c20e34ef2aaff82 iscsitarget-1.4.20.2.tar.gz -19f311cf41aff5f13b371ff38aa543df iscsitarget-2.6.36.patch -f29a9701fd2ba3e6e3c0c411ff0e6327 iscsitarget-2.6.37.patch -26c42eeb23f5afd5f62dcd5aa3a639bd iscsitarget-2.6.38.patch" diff --git a/main/iscsitarget-grsec/iscsitarget-2.6.36.patch b/main/iscsitarget-grsec/iscsitarget-2.6.36.patch deleted file mode 100644 index 43feb89975..0000000000 --- a/main/iscsitarget-grsec/iscsitarget-2.6.36.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- iscsitarget-1.4.20.2/kernel/conn.c -+++ iscsitarget-1.4.20.2.mod/kernel/conn.c -@@ -44,7 +44,7 @@ - switch (sk->sk_family) { - case AF_INET: - snprintf(buf, sizeof(buf), -- "%u.%u.%u.%u", NIPQUAD(inet_sk(sk)->inet_daddr)); -+ "%pI4",inet_sk(sk)->inet_daddr); - break; - case AF_INET6: - snprintf(buf, sizeof(buf), "[%pI6]", diff --git a/main/iscsitarget-grsec/iscsitarget-2.6.37.patch b/main/iscsitarget-grsec/iscsitarget-2.6.37.patch deleted file mode 100644 index 42c2e7ec43..0000000000 --- a/main/iscsitarget-grsec/iscsitarget-2.6.37.patch +++ /dev/null @@ -1,283 +0,0 @@ -diff --git a/kernel/config.c b/kernel/config.c -index 87fa44b..672a1e3 100644 ---- a/kernel/config.c -+++ b/kernel/config.c -@@ -9,7 +9,7 @@ - #include "iscsi.h" - #include "iscsi_dbg.h" - --static DECLARE_MUTEX(ioctl_sem); -+static DEFINE_MUTEX(ioctl_mutex); - - struct proc_entries { - const char *name; -@@ -258,7 +258,7 @@ static long ioctl(struct file *file, unsigned int cmd, unsigned long arg) - long err; - u32 id; - -- err = down_interruptible(&ioctl_sem); -+ err = mutex_lock_interruptible(&ioctl_mutex); - if (err < 0) - return err; - -@@ -339,7 +339,7 @@ static long ioctl(struct file *file, unsigned int cmd, unsigned long arg) - - target_unlock(target); - done: -- up(&ioctl_sem); -+ mutex_unlock(&ioctl_mutex); - - return err; - } -@@ -347,9 +347,9 @@ done: - static int release(struct inode *i __attribute__((unused)), - struct file *f __attribute__((unused))) - { -- down(&ioctl_sem); -+ mutex_lock(&ioctl_mutex); - target_del_all(); -- up(&ioctl_sem); -+ mutex_unlock(&ioctl_mutex); - - return 0; - } -diff --git a/kernel/iscsi.h b/kernel/iscsi.h -index 9ded23a..f9076f2 100644 ---- a/kernel/iscsi.h -+++ b/kernel/iscsi.h -@@ -8,7 +8,6 @@ - #ifndef __ISCSI_H__ - #define __ISCSI_H__ - --#include <linux/blkdev.h> - #include <linux/completion.h> - #include <linux/pagemap.h> - #include <linux/seq_file.h> -@@ -94,8 +93,6 @@ struct worker_thread_info { - struct list_head work_queue; - - wait_queue_head_t wthread_sleep; -- -- struct io_context *wthread_ioc; - }; - - struct iscsi_cmnd; -@@ -130,7 +127,7 @@ struct iscsi_target { - /* Points either to own list or global pool */ - struct worker_thread_info * wthread_info; - -- struct semaphore target_sem; -+ struct mutex target_mutex; - }; - - struct iscsi_queue { -diff --git a/kernel/target.c b/kernel/target.c -index 43326dc..2df633b 100644 ---- a/kernel/target.c -+++ b/kernel/target.c -@@ -4,6 +4,8 @@ - * Released under the terms of the GNU GPL v2.0. - */ - -+#include <linux/mutex.h> -+ - #include "iscsi.h" - #include "digest.h" - #include "iscsi_dbg.h" -@@ -11,7 +13,7 @@ - #define MAX_NR_TARGETS (1UL << 30) - - static LIST_HEAD(target_list); --static DECLARE_MUTEX(target_list_sem); -+static DEFINE_MUTEX(target_list_mutex); - static u32 next_target_id; - static u32 nr_targets; - -@@ -48,16 +50,16 @@ inline int target_lock(struct iscsi_target *target, int interruptible) - int err = 0; - - if (interruptible) -- err = down_interruptible(&target->target_sem); -+ err = mutex_lock_interruptible(&target->target_mutex); - else -- down(&target->target_sem); -+ mutex_lock(&target->target_mutex); - - return err; - } - - inline void target_unlock(struct iscsi_target *target) - { -- up(&target->target_sem); -+ mutex_unlock(&target->target_mutex); - } - - static struct iscsi_target *__target_lookup_by_id(u32 id) -@@ -86,9 +88,9 @@ struct iscsi_target *target_lookup_by_id(u32 id) - { - struct iscsi_target *target; - -- down(&target_list_sem); -+ mutex_lock(&target_list_mutex); - target = __target_lookup_by_id(id); -- up(&target_list_sem); -+ mutex_unlock(&target_list_mutex); - - return target; - } -@@ -157,7 +159,7 @@ static int iscsi_target_create(struct target_info *info, u32 tid) - - strncpy(target->name, name, sizeof(target->name) - 1); - -- init_MUTEX(&target->target_sem); -+ mutex_init(&target->target_mutex); - spin_lock_init(&target->session_list_lock); - - INIT_LIST_HEAD(&target->session_list); -@@ -195,7 +197,7 @@ int target_add(struct target_info *info) - u32 tid = info->tid; - int err; - -- err = down_interruptible(&target_list_sem); -+ err = mutex_lock_interruptible(&target_list_mutex); - if (err < 0) - return err; - -@@ -204,7 +206,7 @@ int target_add(struct target_info *info) - goto out; - } - -- if (__target_lookup_by_name(info->name) || -+ if (__target_lookup_by_name(info->name) || - (tid && __target_lookup_by_id(tid))) { - err = -EEXIST; - goto out; -@@ -223,7 +225,7 @@ int target_add(struct target_info *info) - if (!err) - nr_targets++; - out: -- up(&target_list_sem); -+ mutex_unlock(&target_list_mutex); - - return err; - } -@@ -248,7 +250,7 @@ static void target_destroy(struct iscsi_target *target) - module_put(THIS_MODULE); - } - --/* @locking: target_list_sem must be locked */ -+/* @locking: target_list_mutex must be locked */ - static int __target_del(struct iscsi_target *target) - { - int err; -@@ -283,7 +285,7 @@ int target_del(u32 id) - struct iscsi_target *target; - int err; - -- err = down_interruptible(&target_list_sem); -+ err = mutex_lock_interruptible(&target_list_mutex); - if (err < 0) - return err; - -@@ -295,7 +297,7 @@ int target_del(u32 id) - - err = __target_del(target); - out: -- up(&target_list_sem); -+ mutex_unlock(&target_list_mutex); - - return err; - } -@@ -305,7 +307,7 @@ void target_del_all(void) - struct iscsi_target *target, *tmp; - int err; - -- down(&target_list_sem); -+ mutex_lock(&target_list_mutex); - - if (!list_empty(&target_list)) - iprintk("Removing all connections, sessions and targets\n"); -@@ -319,7 +321,7 @@ void target_del_all(void) - - next_target_id = 0; - -- up(&target_list_sem); -+ mutex_unlock(&target_list_mutex); - } - - static void *iet_seq_start(struct seq_file *m, loff_t *pos) -@@ -327,7 +329,7 @@ static void *iet_seq_start(struct seq_file *m, loff_t *pos) - int err; - - /* are you sure this is to be interruptible? */ -- err = down_interruptible(&target_list_sem); -+ err = mutex_lock_interruptible(&target_list_mutex); - if (err < 0) - return ERR_PTR(err); - -@@ -341,7 +343,7 @@ static void *iet_seq_next(struct seq_file *m, void *v, loff_t *pos) - - static void iet_seq_stop(struct seq_file *m, void *v) - { -- up(&target_list_sem); -+ mutex_unlock(&target_list_mutex); - } - - static int iet_seq_show(struct seq_file *m, void *p) -diff --git a/kernel/volume.c b/kernel/volume.c -index 2c9a698..ecffa21 100644 ---- a/kernel/volume.c -+++ b/kernel/volume.c -@@ -6,6 +6,7 @@ - - #include <linux/types.h> - #include <linux/parser.h> -+#include <linux/blkdev.h> - - #include "iscsi.h" - #include "iscsi_dbg.h" -diff --git a/kernel/wthread.c b/kernel/wthread.c -index 997a3d6..884c03a 100644 ---- a/kernel/wthread.c -+++ b/kernel/wthread.c -@@ -67,15 +67,6 @@ static int worker_thread(void *arg) - struct iscsi_conn *conn; - DECLARE_WAITQUEUE(wait, current); - -- get_io_context(GFP_KERNEL, -1); -- -- if (!current->io_context) -- eprintk("%s\n", "Failed to get IO context"); -- else if (info->wthread_ioc) -- copy_io_context(¤t->io_context, &info->wthread_ioc); -- else -- info->wthread_ioc = current->io_context; -- - add_wait_queue(&info->wthread_sleep, &wait); - - __set_current_state(TASK_RUNNING); -@@ -100,16 +91,6 @@ static int worker_thread(void *arg) - - remove_wait_queue(&info->wthread_sleep, &wait); - -- if (current->io_context) { -- struct io_context *ioc = current->io_context; -- -- task_lock(current); -- current->io_context = NULL; -- task_unlock(current); -- -- put_io_context(ioc); -- } -- - return 0; - } - -@@ -160,7 +141,6 @@ int wthread_init(struct worker_thread_info *info) - spin_lock_init(&info->wthread_lock); - - info->nr_running_wthreads = 0; -- info->wthread_ioc = NULL; - - INIT_LIST_HEAD(&info->work_queue); - INIT_LIST_HEAD(&info->wthread_list); diff --git a/main/iscsitarget-grsec/iscsitarget-2.6.38.patch b/main/iscsitarget-grsec/iscsitarget-2.6.38.patch deleted file mode 100644 index 90a5e56449..0000000000 --- a/main/iscsitarget-grsec/iscsitarget-2.6.38.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- ./kernel/block-io.c.orig -+++ ./kernel/block-io.c -@@ -155,14 +155,14 @@ - { - struct blockio_data *bio_data = volume->private; - struct block_device *bdev; -- int flags = FMODE_READ | (LUReadonly(volume) ? 0 : FMODE_WRITE); -+ int flags = FMODE_EXCL | FMODE_READ | (LUReadonly(volume) ? 0 : FMODE_WRITE); - int err = 0; - - bio_data->path = kstrdup(path, GFP_KERNEL); - if (!bio_data->path) - return -ENOMEM; - -- bdev = open_bdev_exclusive(path, flags, THIS_MODULE); -+ bdev = blkdev_get_by_path(path, flags, THIS_MODULE); - if (IS_ERR(bdev)) { - err = PTR_ERR(bdev); - eprintk("Can't open device %s, error %d\n", path, err); -@@ -250,10 +250,10 @@ - blockio_detach(struct iet_volume *volume) - { - struct blockio_data *bio_data = volume->private; -- int flags = FMODE_READ | (LUReadonly(volume) ? 0 : FMODE_WRITE); -+ int flags = FMODE_EXCL | FMODE_READ | (LUReadonly(volume) ? 0 : FMODE_WRITE); - - if (bio_data->bdev) -- close_bdev_exclusive(bio_data->bdev, flags); -+ blkdev_put(bio_data->bdev, flags); - kfree(bio_data->path); - - kfree(volume->private); diff --git a/main/iscsitarget/APKBUILD b/main/iscsitarget/APKBUILD deleted file mode 100644 index 99528f3f56..0000000000 --- a/main/iscsitarget/APKBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> - -pkgname=iscsitarget -pkgver=1.4.20.2 -pkgrel=3 -pkgdesc="Open Source iSCSI target with professional features - userspace utils" -url="http://iscsitarget.sourceforge.net/" -arch="all" -license="GPL-2" -depends= -makedepends="openssl-dev" -subpackages="$pkgname-doc" -source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - ietd.initd - ietd.confd - " - -_builddir="$srcdir"/$pkgname-$pkgver -prepare() { - cd "$_builddir" - for i in ../*.patch; do - [ -r "$i" ] || continue - msg "Applying $i" - patch -p1 < $i || return 1 - done -} - -build() { - cd "$_builddir" - make usr || return 1 -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install-usr install-doc - - for i in etc/ietd.conf etc/initiators.*; do - install -Dm640 $i "$pkgdir"/$i || return 1 - done - install -Dm755 ../ietd.initd "$pkgdir"/etc/init.d/ietd - install -Dm755 ../ietd.confd "$pkgdir"/etc/conf.d/ietd -} - -md5sums="2f23c0bfe124d79f5c20e34ef2aaff82 iscsitarget-1.4.20.2.tar.gz -840621ee01a5736474ef343b4eb0fa9d ietd.initd -06ba479d3533d557b8582abe6f182410 ietd.confd" diff --git a/main/iscsitarget/ietd.confd b/main/iscsitarget/ietd.confd deleted file mode 100644 index 3621326b1a..0000000000 --- a/main/iscsitarget/ietd.confd +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2006 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/files/ietd-conf.d,v 1.1 2006/02/20 08:33:40 robbat2 Exp $ - -# Address and port to listen on for connections. -#ADDRESS="" # set this to non-empty to listen somewhere specific -PORT=3260 - -# Address of your SNS server -# if available -#ISNS="" - -# User and group to run as -# You must ensure that the UID/GID have access to the files/devices you -# have provided in your configuration. -USER="root" -GROUP="root" - -# Debug level - see ietd(8) for the levels -#DEBUGLEVEL= - -# This setting disables the memory configuration warnings. -# Upstream takes the general policy of forcing all of the memory settings that -# they want, but that doesn't mesh with users that have it set higher. -# Gentoo by default ignores the settings that are higher, but issues warnings -# on those that are lower. -# Uncomment the next line to disable those warnings. -#DISABLE_MEMORY_WARNINGS=1 - -# vim: filetype=gentoo-conf-d tw=72: diff --git a/main/iscsitarget/ietd.initd b/main/iscsitarget/ietd.initd deleted file mode 100644 index ac315609e6..0000000000 --- a/main/iscsitarget/ietd.initd +++ /dev/null @@ -1,107 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/files/ietd-init.d-2,v 1.1 2008/07/18 16:03:38 flameeyes Exp $ - -MEM_SIZE=1048576 -DAEMON=/usr/sbin/ietd -CONFIG_FILE=/etc/ietd.conf -PID_FILE=/var/run/iscsi_trgt.pid -NAME="iSCSI Enterprise Target" - -ARGS="" -[ -n "$USER" ] && ARGS="${ARGS} --uid=${USER}" -[ -n "$GROUP" ] && ARGS="${ARGS} --gid=${GROUP}" -[ -n "$ISNS" ] && ARGS="${ARGS} --isns=${ISNS}" -[ -n "$PORT" ] && ARGS="${ARGS} --port=${PORT}" -[ -n "$ADDRESS" ] && ARGS="${ARGS} --address=${ADDRESS}" -[ -n "$DEBUGLEVEL" ] && ARGS="${ARGS} --debug=${DEBUGLEVEL}" - -depend() { - use net - after firewall modules -} - -checkconfig() { - if [ ! -f $CONFIG_FILE ]; then - eerror "Config file $CONFIG_FILE does not exist!" - return 1 - fi - if [ -z "$DISABLE_MEMORY_WARNINGS" ]; then - check_memsize - fi -} - -check_memsize() { - local wr md sysctl_key v k - for wr in r w; do - for md in max default; do - sysctl_key="net.core.${wr}mem_${md}" - v="$(sysctl -n ${sysctl_key})" - if [ "${v}" -lt "${MEM_SIZE}" ]; then - ewarn "$sysctl_key ($v) is lower than recommended ${MEM_SIZE}" - fi - done - done - for wr in "" r w; do - sysctl_key="net.ipv4.tcp_${wr}mem" - set -- $(sysctl -n ${sysctl_key}) - for k in min default max ; do - if [ "${1}" -lt "${MEM_SIZE}" ]; then - ewarn "$sysctl_key:$k (${1}) is lower than recommended ${MEM_SIZE}" - fi - shift - done - done -} - -do_modules() { - msg="$1" - shift - modules="$1" - shift - opts="$@" - for m in ${modules}; do - ebegin "${msg} - ${m}" - modprobe ${opts} $m - ret=$? - eend $ret - [ $ret -ne 0 ] && return $ret - done - return 0 -} - -start() { - checkconfig || return 1 - do_modules 'Loading iSCSI-Target modules' 'iscsi_trgt' - ebegin "Starting ${NAME}" - start-stop-daemon --start --exec $DAEMON --quiet -- ${ARGS} - eend $? -} - -stop() { - ebegin "Removing ${NAME} devices" - # ugly, but ietadm does not allways provides correct exit values - RETURN="$(ietadm --op delete 2>&1)" - RETVAL=$? - if [ $RETVAL -eq 0 ] && [ "$RETURN" != "something wrong" ] ; then - eend 0 - else - eend 1 - eerror "ietadm failed - $RETURN" - return 1 - fi - - ebegin "Stopping ${NAME}" - start-stop-daemon --stop --quiet --exec $DAEMON --pidfile $PID_FILE - ret=$? - eend $ret - [ $ret -ne 0 ] && return 1 - - # ugly, but pid file is not removed by ietd - rm -f $PID_FILE - # do_modules 'Removing iSCSI-Target modules' 'iscsi_trgt' '-r' - return $? -} - -# vim: tw=72: diff --git a/main/jasper/APKBUILD b/main/jasper/APKBUILD index ff083e7567..915c9d6087 100644 --- a/main/jasper/APKBUILD +++ b/main/jasper/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=jasper pkgver=1.900.1 -pkgrel=6 +pkgrel=7 pkgdesc="A software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard" url="http://www.ece.uvic.ca/~mdadams/jasper/" arch="all" @@ -10,12 +10,21 @@ depends= #"libjpeg>=8 freeglut libxi libxmu mesa" makedepends="jpeg-dev>=8" subpackages="$pkgname-dev $pkgname-doc libjasper" source="http://www.ece.uvic.ca/~mdadams/$pkgname/software/$pkgname-$pkgver.zip - jpc_dec.c.patch" + jpc_dec.c.patch + libjasper-stepsizes-overflow.patch + jasper-1.900.1-CVE-2008-3520.patch + jasper-1.900.1-CVE-2008-3522.patch + jasper-1.900.1-bnc725758.patch + " _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" - patch -Np1 < "$srcdir"/jpc_dec.c.patch || return 1 + for i in $source; do + case $i in + *.patch) msg $i; patch -Np1 -i "$srcdir"/$i || return 1;; + esac + done chmod +x configure } @@ -43,4 +52,8 @@ libjasper() { } md5sums="a342b2b4495b3e1394e161eb5d85d754 jasper-1.900.1.zip -36de7128eea6f701c1e2e13ce5bd8d37 jpc_dec.c.patch" +36de7128eea6f701c1e2e13ce5bd8d37 jpc_dec.c.patch +24785d8eb3eea19eec7e77d59f3e6a25 libjasper-stepsizes-overflow.patch +911bb13529483c093d12c15eed4e9243 jasper-1.900.1-CVE-2008-3520.patch +ed441f30c4231f319d9ff77d86db2ef9 jasper-1.900.1-CVE-2008-3522.patch +eaf73536f989e629a8c06533e4e6fad5 jasper-1.900.1-bnc725758.patch" diff --git a/main/jasper/jasper-1.900.1-CVE-2008-3520.patch b/main/jasper/jasper-1.900.1-CVE-2008-3520.patch new file mode 100644 index 0000000000..0f5e3b7468 --- /dev/null +++ b/main/jasper/jasper-1.900.1-CVE-2008-3520.patch @@ -0,0 +1,928 @@ +https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3520 + +OpenBSD jas_malloc hardening patches + +diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_cm.c jasper-1.900.1/src/libjasper/base/jas_cm.c +--- jasper-1.900.1.orig/src/libjasper/base/jas_cm.c 2007-01-19 22:43:05.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/base/jas_cm.c 2009-10-22 10:27:45.000000000 +0200 +@@ -704,8 +704,7 @@ static int jas_cmpxformseq_resize(jas_cm + { + jas_cmpxform_t **p; + assert(n >= pxformseq->numpxforms); +- p = (!pxformseq->pxforms) ? jas_malloc(n * sizeof(jas_cmpxform_t *)) : +- jas_realloc(pxformseq->pxforms, n * sizeof(jas_cmpxform_t *)); ++ p = jas_realloc2(pxformseq->pxforms, n, sizeof(jas_cmpxform_t *)); + if (!p) { + return -1; + } +@@ -889,13 +888,13 @@ static int jas_cmshapmatlut_set(jas_cmsh + jas_cmshapmatlut_cleanup(lut); + if (curv->numents == 0) { + lut->size = 2; +- if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t)))) ++ if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t)))) + goto error; + lut->data[0] = 0.0; + lut->data[1] = 1.0; + } else if (curv->numents == 1) { + lut->size = 256; +- if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t)))) ++ if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t)))) + goto error; + gamma = curv->ents[0] / 256.0; + for (i = 0; i < lut->size; ++i) { +@@ -903,7 +902,7 @@ static int jas_cmshapmatlut_set(jas_cmsh + } + } else { + lut->size = curv->numents; +- if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t)))) ++ if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t)))) + goto error; + for (i = 0; i < lut->size; ++i) { + lut->data[i] = curv->ents[i] / 65535.0; +@@ -953,7 +952,7 @@ static int jas_cmshapmatlut_invert(jas_c + return -1; + } + } +- if (!(invlut->data = jas_malloc(n * sizeof(jas_cmreal_t)))) ++ if (!(invlut->data = jas_alloc2(n, sizeof(jas_cmreal_t)))) + return -1; + invlut->size = n; + for (i = 0; i < invlut->size; ++i) { +diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_icc.c jasper-1.900.1/src/libjasper/base/jas_icc.c +--- jasper-1.900.1.orig/src/libjasper/base/jas_icc.c 2007-01-19 22:43:05.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/base/jas_icc.c 2009-10-22 10:27:45.000000000 +0200 +@@ -373,7 +373,7 @@ int jas_iccprof_save(jas_iccprof_t *prof + jas_icctagtab_t *tagtab; + + tagtab = &prof->tagtab; +- if (!(tagtab->ents = jas_malloc(prof->attrtab->numattrs * ++ if (!(tagtab->ents = jas_alloc2(prof->attrtab->numattrs, + sizeof(jas_icctagtabent_t)))) + goto error; + tagtab->numents = prof->attrtab->numattrs; +@@ -522,7 +522,7 @@ static int jas_iccprof_gettagtab(jas_str + } + if (jas_iccgetuint32(in, &tagtab->numents)) + goto error; +- if (!(tagtab->ents = jas_malloc(tagtab->numents * ++ if (!(tagtab->ents = jas_alloc2(tagtab->numents, + sizeof(jas_icctagtabent_t)))) + goto error; + tagtabent = tagtab->ents; +@@ -743,8 +743,7 @@ static int jas_iccattrtab_resize(jas_icc + { + jas_iccattr_t *newattrs; + assert(maxents >= tab->numattrs); +- newattrs = tab->attrs ? jas_realloc(tab->attrs, maxents * +- sizeof(jas_iccattr_t)) : jas_malloc(maxents * sizeof(jas_iccattr_t)); ++ newattrs = jas_realloc2(tab->attrs, maxents, sizeof(jas_iccattr_t)); + if (!newattrs) + return -1; + tab->attrs = newattrs; +@@ -999,7 +998,7 @@ static int jas_icccurv_input(jas_iccattr + + if (jas_iccgetuint32(in, &curv->numents)) + goto error; +- if (!(curv->ents = jas_malloc(curv->numents * sizeof(jas_iccuint16_t)))) ++ if (!(curv->ents = jas_alloc2(curv->numents, sizeof(jas_iccuint16_t)))) + goto error; + for (i = 0; i < curv->numents; ++i) { + if (jas_iccgetuint16(in, &curv->ents[i])) +@@ -1100,7 +1099,7 @@ static int jas_icctxtdesc_input(jas_icca + if (jas_iccgetuint32(in, &txtdesc->uclangcode) || + jas_iccgetuint32(in, &txtdesc->uclen)) + goto error; +- if (!(txtdesc->ucdata = jas_malloc(txtdesc->uclen * 2))) ++ if (!(txtdesc->ucdata = jas_alloc2(txtdesc->uclen, 2))) + goto error; + if (jas_stream_read(in, txtdesc->ucdata, txtdesc->uclen * 2) != + JAS_CAST(int, txtdesc->uclen * 2)) +@@ -1292,17 +1291,17 @@ static int jas_icclut8_input(jas_iccattr + jas_iccgetuint16(in, &lut8->numouttabents)) + goto error; + clutsize = jas_iccpowi(lut8->clutlen, lut8->numinchans) * lut8->numoutchans; +- if (!(lut8->clut = jas_malloc(clutsize * sizeof(jas_iccuint8_t))) || +- !(lut8->intabsbuf = jas_malloc(lut8->numinchans * +- lut8->numintabents * sizeof(jas_iccuint8_t))) || +- !(lut8->intabs = jas_malloc(lut8->numinchans * ++ if (!(lut8->clut = jas_alloc2(clutsize, sizeof(jas_iccuint8_t))) || ++ !(lut8->intabsbuf = jas_alloc3(lut8->numinchans, ++ lut8->numintabents, sizeof(jas_iccuint8_t))) || ++ !(lut8->intabs = jas_alloc2(lut8->numinchans, + sizeof(jas_iccuint8_t *)))) + goto error; + for (i = 0; i < lut8->numinchans; ++i) + lut8->intabs[i] = &lut8->intabsbuf[i * lut8->numintabents]; +- if (!(lut8->outtabsbuf = jas_malloc(lut8->numoutchans * +- lut8->numouttabents * sizeof(jas_iccuint8_t))) || +- !(lut8->outtabs = jas_malloc(lut8->numoutchans * ++ if (!(lut8->outtabsbuf = jas_alloc3(lut8->numoutchans, ++ lut8->numouttabents, sizeof(jas_iccuint8_t))) || ++ !(lut8->outtabs = jas_alloc2(lut8->numoutchans, + sizeof(jas_iccuint8_t *)))) + goto error; + for (i = 0; i < lut8->numoutchans; ++i) +@@ -1461,17 +1460,17 @@ static int jas_icclut16_input(jas_iccatt + jas_iccgetuint16(in, &lut16->numouttabents)) + goto error; + clutsize = jas_iccpowi(lut16->clutlen, lut16->numinchans) * lut16->numoutchans; +- if (!(lut16->clut = jas_malloc(clutsize * sizeof(jas_iccuint16_t))) || +- !(lut16->intabsbuf = jas_malloc(lut16->numinchans * +- lut16->numintabents * sizeof(jas_iccuint16_t))) || +- !(lut16->intabs = jas_malloc(lut16->numinchans * ++ if (!(lut16->clut = jas_alloc2(clutsize, sizeof(jas_iccuint16_t))) || ++ !(lut16->intabsbuf = jas_alloc3(lut16->numinchans, ++ lut16->numintabents, sizeof(jas_iccuint16_t))) || ++ !(lut16->intabs = jas_alloc2(lut16->numinchans, + sizeof(jas_iccuint16_t *)))) + goto error; + for (i = 0; i < lut16->numinchans; ++i) + lut16->intabs[i] = &lut16->intabsbuf[i * lut16->numintabents]; +- if (!(lut16->outtabsbuf = jas_malloc(lut16->numoutchans * +- lut16->numouttabents * sizeof(jas_iccuint16_t))) || +- !(lut16->outtabs = jas_malloc(lut16->numoutchans * ++ if (!(lut16->outtabsbuf = jas_alloc3(lut16->numoutchans, ++ lut16->numouttabents, sizeof(jas_iccuint16_t))) || ++ !(lut16->outtabs = jas_alloc2(lut16->numoutchans, + sizeof(jas_iccuint16_t *)))) + goto error; + for (i = 0; i < lut16->numoutchans; ++i) +diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_image.c jasper-1.900.1/src/libjasper/base/jas_image.c +--- jasper-1.900.1.orig/src/libjasper/base/jas_image.c 2007-01-19 22:43:05.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/base/jas_image.c 2009-10-22 10:27:45.000000000 +0200 +@@ -142,7 +142,7 @@ jas_image_t *jas_image_create(int numcmp + image->inmem_ = true; + + /* Allocate memory for the per-component information. */ +- if (!(image->cmpts_ = jas_malloc(image->maxcmpts_ * ++ if (!(image->cmpts_ = jas_alloc2(image->maxcmpts_, + sizeof(jas_image_cmpt_t *)))) { + jas_image_destroy(image); + return 0; +@@ -774,8 +774,7 @@ static int jas_image_growcmpts(jas_image + jas_image_cmpt_t **newcmpts; + int cmptno; + +- newcmpts = (!image->cmpts_) ? jas_malloc(maxcmpts * sizeof(jas_image_cmpt_t *)) : +- jas_realloc(image->cmpts_, maxcmpts * sizeof(jas_image_cmpt_t *)); ++ newcmpts = jas_realloc2(image->cmpts_, maxcmpts, sizeof(jas_image_cmpt_t *)); + if (!newcmpts) { + return -1; + } +diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_malloc.c jasper-1.900.1/src/libjasper/base/jas_malloc.c +--- jasper-1.900.1.orig/src/libjasper/base/jas_malloc.c 2007-01-19 22:43:05.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/base/jas_malloc.c 2009-10-22 10:27:45.000000000 +0200 +@@ -76,6 +76,9 @@ + + /* We need the prototype for memset. */ + #include <string.h> ++#include <limits.h> ++#include <errno.h> ++#include <stdint.h> + + #include "jasper/jas_malloc.h" + +@@ -113,18 +116,50 @@ void jas_free(void *ptr) + + void *jas_realloc(void *ptr, size_t size) + { +- return realloc(ptr, size); ++ return ptr ? realloc(ptr, size) : malloc(size); + } + +-void *jas_calloc(size_t nmemb, size_t size) ++void *jas_realloc2(void *ptr, size_t nmemb, size_t size) ++{ ++ if (!ptr) ++ return jas_alloc2(nmemb, size); ++ if (nmemb && SIZE_MAX / nmemb < size) { ++ errno = ENOMEM; ++ return NULL; ++ } ++ return jas_realloc(ptr, nmemb * size); ++ ++} ++ ++void *jas_alloc2(size_t nmemb, size_t size) ++{ ++ if (nmemb && SIZE_MAX / nmemb < size) { ++ errno = ENOMEM; ++ return NULL; ++ } ++ ++ return jas_malloc(nmemb * size); ++} ++ ++void *jas_alloc3(size_t a, size_t b, size_t c) + { +- void *ptr; + size_t n; +- n = nmemb * size; +- if (!(ptr = jas_malloc(n * sizeof(char)))) { +- return 0; ++ ++ if (a && SIZE_MAX / a < b) { ++ errno = ENOMEM; ++ return NULL; + } +- memset(ptr, 0, n); ++ ++ return jas_alloc2(a*b, c); ++} ++ ++void *jas_calloc(size_t nmemb, size_t size) ++{ ++ void *ptr; ++ ++ ptr = jas_alloc2(nmemb, size); ++ if (ptr) ++ memset(ptr, 0, nmemb*size); + return ptr; + } + +diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_seq.c jasper-1.900.1/src/libjasper/base/jas_seq.c +--- jasper-1.900.1.orig/src/libjasper/base/jas_seq.c 2007-01-19 22:43:05.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/base/jas_seq.c 2009-10-22 10:27:45.000000000 +0200 +@@ -114,7 +114,7 @@ jas_matrix_t *jas_matrix_create(int numr + matrix->datasize_ = numrows * numcols; + + if (matrix->maxrows_ > 0) { +- if (!(matrix->rows_ = jas_malloc(matrix->maxrows_ * ++ if (!(matrix->rows_ = jas_alloc2(matrix->maxrows_, + sizeof(jas_seqent_t *)))) { + jas_matrix_destroy(matrix); + return 0; +@@ -122,7 +122,7 @@ jas_matrix_t *jas_matrix_create(int numr + } + + if (matrix->datasize_ > 0) { +- if (!(matrix->data_ = jas_malloc(matrix->datasize_ * ++ if (!(matrix->data_ = jas_alloc2(matrix->datasize_, + sizeof(jas_seqent_t)))) { + jas_matrix_destroy(matrix); + return 0; +@@ -220,7 +220,7 @@ void jas_matrix_bindsub(jas_matrix_t *ma + mat0->numrows_ = r1 - r0 + 1; + mat0->numcols_ = c1 - c0 + 1; + mat0->maxrows_ = mat0->numrows_; +- mat0->rows_ = jas_malloc(mat0->maxrows_ * sizeof(jas_seqent_t *)); ++ mat0->rows_ = jas_alloc2(mat0->maxrows_, sizeof(jas_seqent_t *)); + for (i = 0; i < mat0->numrows_; ++i) { + mat0->rows_[i] = mat1->rows_[r0 + i] + c0; + } +diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_stream.c jasper-1.900.1/src/libjasper/base/jas_stream.c +--- jasper-1.900.1.orig/src/libjasper/base/jas_stream.c 2007-01-19 22:43:05.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/base/jas_stream.c 2009-10-22 10:27:45.000000000 +0200 +@@ -212,7 +212,7 @@ jas_stream_t *jas_stream_memopen(char *b + if (buf) { + obj->buf_ = (unsigned char *) buf; + } else { +- obj->buf_ = jas_malloc(obj->bufsize_ * sizeof(char)); ++ obj->buf_ = jas_malloc(obj->bufsize_); + obj->myalloc_ = 1; + } + if (!obj->buf_) { +@@ -992,7 +992,7 @@ static int mem_resize(jas_stream_memobj_ + unsigned char *buf; + + assert(m->buf_); +- if (!(buf = jas_realloc(m->buf_, bufsize * sizeof(unsigned char)))) { ++ if (!(buf = jas_realloc(m->buf_, bufsize))) { + return -1; + } + m->buf_ = buf; +diff -pruN jasper-1.900.1.orig/src/libjasper/bmp/bmp_dec.c jasper-1.900.1/src/libjasper/bmp/bmp_dec.c +--- jasper-1.900.1.orig/src/libjasper/bmp/bmp_dec.c 2007-01-19 22:43:07.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/bmp/bmp_dec.c 2009-10-22 10:27:45.000000000 +0200 +@@ -283,7 +283,7 @@ static bmp_info_t *bmp_getinfo(jas_strea + } + + if (info->numcolors > 0) { +- if (!(info->palents = jas_malloc(info->numcolors * ++ if (!(info->palents = jas_alloc2(info->numcolors, + sizeof(bmp_palent_t)))) { + bmp_info_destroy(info); + return 0; +diff -pruN jasper-1.900.1.orig/src/libjasper/include/jasper/jas_malloc.h jasper-1.900.1/src/libjasper/include/jasper/jas_malloc.h +--- jasper-1.900.1.orig/src/libjasper/include/jasper/jas_malloc.h 2007-01-19 22:43:04.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/include/jasper/jas_malloc.h 2009-10-22 10:27:45.000000000 +0200 +@@ -95,6 +95,9 @@ extern "C" { + #define jas_free MEMFREE + #define jas_realloc MEMREALLOC + #define jas_calloc MEMCALLOC ++#define jas_alloc2(a, b) MEMALLOC((a)*(b)) ++#define jas_alloc3(a, b, c) MEMALLOC((a)*(b)*(c)) ++#define jas_realloc2(p, a, b) MEMREALLOC((p), (a)*(b)) + #endif + + /******************************************************************************\ +@@ -115,6 +118,12 @@ void *jas_realloc(void *ptr, size_t size + /* Allocate a block of memory and initialize the contents to zero. */ + void *jas_calloc(size_t nmemb, size_t size); + ++/* size-checked double allocation .*/ ++void *jas_alloc2(size_t, size_t); ++ ++void *jas_alloc3(size_t, size_t, size_t); ++ ++void *jas_realloc2(void *, size_t, size_t); + #endif + + #ifdef __cplusplus +diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_cod.c jasper-1.900.1/src/libjasper/jp2/jp2_cod.c +--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_cod.c 2007-01-19 22:43:05.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jp2/jp2_cod.c 2009-10-22 10:30:24.000000000 +0200 +@@ -247,7 +247,7 @@ jp2_box_t *jp2_box_get(jas_stream_t *in) + box = 0; + tmpstream = 0; + +- if (!(box = jas_malloc(sizeof(jp2_box_t)))) { ++ if (!(box = jas_calloc(1, sizeof(jp2_box_t)))) { + goto error; + } + box->ops = &jp2_boxinfo_unk.ops; +@@ -372,7 +372,7 @@ static int jp2_bpcc_getdata(jp2_box_t *b + jp2_bpcc_t *bpcc = &box->data.bpcc; + unsigned int i; + bpcc->numcmpts = box->datalen; +- if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts * sizeof(uint_fast8_t)))) { ++ if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts, sizeof(uint_fast8_t)))) { + return -1; + } + for (i = 0; i < bpcc->numcmpts; ++i) { +@@ -416,7 +416,7 @@ static int jp2_colr_getdata(jp2_box_t *b + break; + case JP2_COLR_ICC: + colr->iccplen = box->datalen - 3; +- if (!(colr->iccp = jas_malloc(colr->iccplen * sizeof(uint_fast8_t)))) { ++ if (!(colr->iccp = jas_alloc2(colr->iccplen, sizeof(uint_fast8_t)))) { + return -1; + } + if (jas_stream_read(in, colr->iccp, colr->iccplen) != colr->iccplen) { +@@ -453,7 +453,7 @@ static int jp2_cdef_getdata(jp2_box_t *b + if (jp2_getuint16(in, &cdef->numchans)) { + return -1; + } +- if (!(cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t)))) { ++ if (!(cdef->ents = jas_alloc2(cdef->numchans, sizeof(jp2_cdefchan_t)))) { + return -1; + } + for (channo = 0; channo < cdef->numchans; ++channo) { +@@ -766,7 +766,7 @@ static int jp2_cmap_getdata(jp2_box_t *b + unsigned int i; + + cmap->numchans = (box->datalen) / 4; +- if (!(cmap->ents = jas_malloc(cmap->numchans * sizeof(jp2_cmapent_t)))) { ++ if (!(cmap->ents = jas_alloc2(cmap->numchans, sizeof(jp2_cmapent_t)))) { + return -1; + } + for (i = 0; i < cmap->numchans; ++i) { +@@ -828,10 +828,10 @@ static int jp2_pclr_getdata(jp2_box_t *b + return -1; + } + lutsize = pclr->numlutents * pclr->numchans; +- if (!(pclr->lutdata = jas_malloc(lutsize * sizeof(int_fast32_t)))) { ++ if (!(pclr->lutdata = jas_alloc2(lutsize, sizeof(int_fast32_t)))) { + return -1; + } +- if (!(pclr->bpc = jas_malloc(pclr->numchans * sizeof(uint_fast8_t)))) { ++ if (!(pclr->bpc = jas_alloc2(pclr->numchans, sizeof(uint_fast8_t)))) { + return -1; + } + for (i = 0; i < pclr->numchans; ++i) { +diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c jasper-1.900.1/src/libjasper/jp2/jp2_dec.c +--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c 2007-01-19 22:43:05.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c 2009-10-22 10:27:45.000000000 +0200 +@@ -336,7 +336,7 @@ jas_image_t *jp2_decode(jas_stream_t *in + } + + /* Allocate space for the channel-number to component-number LUT. */ +- if (!(dec->chantocmptlut = jas_malloc(dec->numchans * sizeof(uint_fast16_t)))) { ++ if (!(dec->chantocmptlut = jas_alloc2(dec->numchans, sizeof(uint_fast16_t)))) { + jas_eprintf("error: no memory\n"); + goto error; + } +@@ -354,7 +354,7 @@ jas_image_t *jp2_decode(jas_stream_t *in + if (cmapent->map == JP2_CMAP_DIRECT) { + dec->chantocmptlut[channo] = channo; + } else if (cmapent->map == JP2_CMAP_PALETTE) { +- lutents = jas_malloc(pclrd->numlutents * sizeof(int_fast32_t)); ++ lutents = jas_alloc2(pclrd->numlutents, sizeof(int_fast32_t)); + for (i = 0; i < pclrd->numlutents; ++i) { + lutents[i] = pclrd->lutdata[cmapent->pcol + i * pclrd->numchans]; + } +diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_enc.c jasper-1.900.1/src/libjasper/jp2/jp2_enc.c +--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_enc.c 2007-01-19 22:43:05.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jp2/jp2_enc.c 2009-10-22 10:27:45.000000000 +0200 +@@ -191,7 +191,7 @@ int sgnd; + } + bpcc = &box->data.bpcc; + bpcc->numcmpts = jas_image_numcmpts(image); +- if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts * ++ if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts, + sizeof(uint_fast8_t)))) { + goto error; + } +@@ -285,7 +285,7 @@ int sgnd; + } + cdef = &box->data.cdef; + cdef->numchans = jas_image_numcmpts(image); +- cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t)); ++ cdef->ents = jas_alloc2(cdef->numchans, sizeof(jp2_cdefchan_t)); + for (i = 0; i < jas_image_numcmpts(image); ++i) { + cdefchanent = &cdef->ents[i]; + cdefchanent->channo = i; +diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c jasper-1.900.1/src/libjasper/jpc/jpc_cs.c +--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c 2009-10-22 09:58:16.000000000 +0200 ++++ jasper-1.900.1/src/libjasper/jpc/jpc_cs.c 2009-10-22 10:27:45.000000000 +0200 +@@ -502,7 +502,7 @@ static int jpc_siz_getparms(jpc_ms_t *ms + !siz->tileheight || !siz->numcomps) { + return -1; + } +- if (!(siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t)))) { ++ if (!(siz->comps = jas_alloc2(siz->numcomps, sizeof(jpc_sizcomp_t)))) { + return -1; + } + for (i = 0; i < siz->numcomps; ++i) { +@@ -986,7 +986,7 @@ static int jpc_qcx_getcompparms(jpc_qcxc + jpc_qcx_destroycompparms(compparms); + return -1; + } else if (compparms->numstepsizes > 0) { +- compparms->stepsizes = jas_malloc(compparms->numstepsizes * ++ compparms->stepsizes = jas_alloc2(compparms->numstepsizes, + sizeof(uint_fast16_t)); + assert(compparms->stepsizes); + for (i = 0; i < compparms->numstepsizes; ++i) { +@@ -1094,7 +1094,7 @@ static int jpc_ppm_getparms(jpc_ms_t *ms + + ppm->len = ms->len - 1; + if (ppm->len > 0) { +- if (!(ppm->data = jas_malloc(ppm->len * sizeof(unsigned char)))) { ++ if (!(ppm->data = jas_malloc(ppm->len))) { + goto error; + } + if (JAS_CAST(uint, jas_stream_read(in, ppm->data, ppm->len)) != ppm->len) { +@@ -1163,7 +1163,7 @@ static int jpc_ppt_getparms(jpc_ms_t *ms + } + ppt->len = ms->len - 1; + if (ppt->len > 0) { +- if (!(ppt->data = jas_malloc(ppt->len * sizeof(unsigned char)))) { ++ if (!(ppt->data = jas_malloc(ppt->len))) { + goto error; + } + if (jas_stream_read(in, (char *) ppt->data, ppt->len) != JAS_CAST(int, ppt->len)) { +@@ -1226,7 +1226,7 @@ static int jpc_poc_getparms(jpc_ms_t *ms + uint_fast8_t tmp; + poc->numpchgs = (cstate->numcomps > 256) ? (ms->len / 9) : + (ms->len / 7); +- if (!(poc->pchgs = jas_malloc(poc->numpchgs * sizeof(jpc_pocpchg_t)))) { ++ if (!(poc->pchgs = jas_alloc2(poc->numpchgs, sizeof(jpc_pocpchg_t)))) { + goto error; + } + for (pchgno = 0, pchg = poc->pchgs; pchgno < poc->numpchgs; ++pchgno, +@@ -1331,7 +1331,7 @@ static int jpc_crg_getparms(jpc_ms_t *ms + jpc_crgcomp_t *comp; + uint_fast16_t compno; + crg->numcomps = cstate->numcomps; +- if (!(crg->comps = jas_malloc(cstate->numcomps * sizeof(uint_fast16_t)))) { ++ if (!(crg->comps = jas_alloc2(cstate->numcomps, sizeof(uint_fast16_t)))) { + return -1; + } + for (compno = 0, comp = crg->comps; compno < cstate->numcomps; +@@ -1470,7 +1470,7 @@ static int jpc_unk_getparms(jpc_ms_t *ms + cstate = 0; + + if (ms->len > 0) { +- if (!(unk->data = jas_malloc(ms->len * sizeof(unsigned char)))) { ++ if (!(unk->data = jas_malloc(ms->len))) { + return -1; + } + if (jas_stream_read(in, (char *) unk->data, ms->len) != JAS_CAST(int, ms->len)) { +diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c jasper-1.900.1/src/libjasper/jpc/jpc_dec.c +--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c 2009-10-22 09:58:16.000000000 +0200 ++++ jasper-1.900.1/src/libjasper/jpc/jpc_dec.c 2009-10-22 10:30:50.000000000 +0200 +@@ -449,7 +449,7 @@ static int jpc_dec_process_sot(jpc_dec_t + + if (dec->state == JPC_MH) { + +- compinfos = jas_malloc(dec->numcomps * sizeof(jas_image_cmptparm_t)); ++ compinfos = jas_alloc2(dec->numcomps, sizeof(jas_image_cmptparm_t)); + assert(compinfos); + for (cmptno = 0, cmpt = dec->cmpts, compinfo = compinfos; + cmptno < dec->numcomps; ++cmptno, ++cmpt, ++compinfo) { +@@ -692,7 +692,7 @@ static int jpc_dec_tileinit(jpc_dec_t *d + tile->realmode = 1; + } + tcomp->numrlvls = ccp->numrlvls; +- if (!(tcomp->rlvls = jas_malloc(tcomp->numrlvls * ++ if (!(tcomp->rlvls = jas_alloc2(tcomp->numrlvls, + sizeof(jpc_dec_rlvl_t)))) { + return -1; + } +@@ -764,7 +764,7 @@ rlvl->bands = 0; + rlvl->cbgheightexpn); + + rlvl->numbands = (!rlvlno) ? 1 : 3; +- if (!(rlvl->bands = jas_malloc(rlvl->numbands * ++ if (!(rlvl->bands = jas_alloc2(rlvl->numbands, + sizeof(jpc_dec_band_t)))) { + return -1; + } +@@ -797,7 +797,7 @@ rlvl->bands = 0; + + assert(rlvl->numprcs); + +- if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_dec_prc_t)))) { ++ if (!(band->prcs = jas_alloc2(rlvl->numprcs, sizeof(jpc_dec_prc_t)))) { + return -1; + } + +@@ -834,7 +834,7 @@ rlvl->bands = 0; + if (!(prc->numimsbstagtree = jpc_tagtree_create(prc->numhcblks, prc->numvcblks))) { + return -1; + } +- if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_dec_cblk_t)))) { ++ if (!(prc->cblks = jas_alloc2(prc->numcblks, sizeof(jpc_dec_cblk_t)))) { + return -1; + } + +@@ -1181,7 +1181,7 @@ static int jpc_dec_process_siz(jpc_dec_t + return -1; + } + +- if (!(dec->cmpts = jas_malloc(dec->numcomps * sizeof(jpc_dec_cmpt_t)))) { ++ if (!(dec->cmpts = jas_alloc2(dec->numcomps, sizeof(jpc_dec_cmpt_t)))) { + return -1; + } + +@@ -1204,7 +1204,7 @@ static int jpc_dec_process_siz(jpc_dec_t + dec->numhtiles = JPC_CEILDIV(dec->xend - dec->tilexoff, dec->tilewidth); + dec->numvtiles = JPC_CEILDIV(dec->yend - dec->tileyoff, dec->tileheight); + dec->numtiles = dec->numhtiles * dec->numvtiles; +- if (!(dec->tiles = jas_malloc(dec->numtiles * sizeof(jpc_dec_tile_t)))) { ++ if (!(dec->tiles = jas_calloc(dec->numtiles, sizeof(jpc_dec_tile_t)))) { + return -1; + } + +@@ -1228,7 +1228,7 @@ static int jpc_dec_process_siz(jpc_dec_t + tile->pkthdrstreampos = 0; + tile->pptstab = 0; + tile->cp = 0; +- if (!(tile->tcomps = jas_malloc(dec->numcomps * ++ if (!(tile->tcomps = jas_calloc(dec->numcomps, + sizeof(jpc_dec_tcomp_t)))) { + return -1; + } +@@ -1489,7 +1489,7 @@ static jpc_dec_cp_t *jpc_dec_cp_create(u + cp->numlyrs = 0; + cp->mctid = 0; + cp->csty = 0; +- if (!(cp->ccps = jas_malloc(cp->numcomps * sizeof(jpc_dec_ccp_t)))) { ++ if (!(cp->ccps = jas_alloc2(cp->numcomps, sizeof(jpc_dec_ccp_t)))) { + return 0; + } + if (!(cp->pchglist = jpc_pchglist_create())) { +@@ -2048,7 +2048,7 @@ jpc_streamlist_t *jpc_streamlist_create( + } + streamlist->numstreams = 0; + streamlist->maxstreams = 100; +- if (!(streamlist->streams = jas_malloc(streamlist->maxstreams * ++ if (!(streamlist->streams = jas_alloc2(streamlist->maxstreams, + sizeof(jas_stream_t *)))) { + jas_free(streamlist); + return 0; +@@ -2068,8 +2068,8 @@ int jpc_streamlist_insert(jpc_streamlist + /* Grow the array of streams if necessary. */ + if (streamlist->numstreams >= streamlist->maxstreams) { + newmaxstreams = streamlist->maxstreams + 1024; +- if (!(newstreams = jas_realloc(streamlist->streams, +- (newmaxstreams + 1024) * sizeof(jas_stream_t *)))) { ++ if (!(newstreams = jas_realloc2(streamlist->streams, ++ (newmaxstreams + 1024), sizeof(jas_stream_t *)))) { + return -1; + } + for (i = streamlist->numstreams; i < streamlist->maxstreams; ++i) { +@@ -2155,8 +2155,7 @@ int jpc_ppxstab_grow(jpc_ppxstab_t *tab, + { + jpc_ppxstabent_t **newents; + if (tab->maxents < maxents) { +- newents = (tab->ents) ? jas_realloc(tab->ents, maxents * +- sizeof(jpc_ppxstabent_t *)) : jas_malloc(maxents * sizeof(jpc_ppxstabent_t *)); ++ newents = jas_realloc2(tab->ents, maxents, sizeof(jpc_ppxstabent_t *)); + if (!newents) { + return -1; + } +diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_enc.c jasper-1.900.1/src/libjasper/jpc/jpc_enc.c +--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_enc.c 2007-01-19 22:43:07.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jpc/jpc_enc.c 2009-10-22 10:27:45.000000000 +0200 +@@ -403,7 +403,7 @@ static jpc_enc_cp_t *cp_create(char *opt + vsteplcm *= jas_image_cmptvstep(image, cmptno); + } + +- if (!(cp->ccps = jas_malloc(cp->numcmpts * sizeof(jpc_enc_ccp_t)))) { ++ if (!(cp->ccps = jas_alloc2(cp->numcmpts, sizeof(jpc_enc_ccp_t)))) { + goto error; + } + for (cmptno = 0, ccp = cp->ccps; cmptno < JAS_CAST(int, cp->numcmpts); ++cmptno, +@@ -656,7 +656,7 @@ static jpc_enc_cp_t *cp_create(char *opt + + if (ilyrrates && numilyrrates > 0) { + tcp->numlyrs = numilyrrates + 1; +- if (!(tcp->ilyrrates = jas_malloc((tcp->numlyrs - 1) * ++ if (!(tcp->ilyrrates = jas_alloc2((tcp->numlyrs - 1), + sizeof(jpc_fix_t)))) { + goto error; + } +@@ -940,7 +940,7 @@ startoff = jas_stream_getrwcount(enc->ou + siz->tilewidth = cp->tilewidth; + siz->tileheight = cp->tileheight; + siz->numcomps = cp->numcmpts; +- siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t)); ++ siz->comps = jas_alloc2(siz->numcomps, sizeof(jpc_sizcomp_t)); + assert(siz->comps); + for (i = 0; i < JAS_CAST(int, cp->numcmpts); ++i) { + siz->comps[i].prec = cp->ccps[i].prec; +@@ -977,7 +977,7 @@ startoff = jas_stream_getrwcount(enc->ou + return -1; + } + crg = &enc->mrk->parms.crg; +- crg->comps = jas_malloc(crg->numcomps * sizeof(jpc_crgcomp_t)); ++ crg->comps = jas_alloc2(crg->numcomps, sizeof(jpc_crgcomp_t)); + if (jpc_putms(enc->out, enc->cstate, enc->mrk)) { + jas_eprintf("cannot write CRG marker\n"); + return -1; +@@ -1955,7 +1955,7 @@ jpc_enc_tile_t *jpc_enc_tile_create(jpc_ + tile->mctid = cp->tcp.mctid; + + tile->numlyrs = cp->tcp.numlyrs; +- if (!(tile->lyrsizes = jas_malloc(tile->numlyrs * ++ if (!(tile->lyrsizes = jas_alloc2(tile->numlyrs, + sizeof(uint_fast32_t)))) { + goto error; + } +@@ -1964,7 +1964,7 @@ jpc_enc_tile_t *jpc_enc_tile_create(jpc_ + } + + /* Allocate an array for the per-tile-component information. */ +- if (!(tile->tcmpts = jas_malloc(cp->numcmpts * sizeof(jpc_enc_tcmpt_t)))) { ++ if (!(tile->tcmpts = jas_alloc2(cp->numcmpts, sizeof(jpc_enc_tcmpt_t)))) { + goto error; + } + /* Initialize a few members critical for error recovery. */ +@@ -2110,7 +2110,7 @@ static jpc_enc_tcmpt_t *tcmpt_create(jpc + jas_seq2d_ystart(tcmpt->data), jas_seq2d_xend(tcmpt->data), + jas_seq2d_yend(tcmpt->data), bandinfos); + +- if (!(tcmpt->rlvls = jas_malloc(tcmpt->numrlvls * sizeof(jpc_enc_rlvl_t)))) { ++ if (!(tcmpt->rlvls = jas_alloc2(tcmpt->numrlvls, sizeof(jpc_enc_rlvl_t)))) { + goto error; + } + for (rlvlno = 0, rlvl = tcmpt->rlvls; rlvlno < tcmpt->numrlvls; +@@ -2213,7 +2213,7 @@ static jpc_enc_rlvl_t *rlvl_create(jpc_e + rlvl->numvprcs = JPC_FLOORDIVPOW2(brprcbry - tlprctly, rlvl->prcheightexpn); + rlvl->numprcs = rlvl->numhprcs * rlvl->numvprcs; + +- if (!(rlvl->bands = jas_malloc(rlvl->numbands * sizeof(jpc_enc_band_t)))) { ++ if (!(rlvl->bands = jas_alloc2(rlvl->numbands, sizeof(jpc_enc_band_t)))) { + goto error; + } + for (bandno = 0, band = rlvl->bands; bandno < rlvl->numbands; +@@ -2290,7 +2290,7 @@ if (bandinfo->xstart != bandinfo->xend & + band->synweight = bandinfo->synenergywt; + + if (band->data) { +- if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_enc_prc_t)))) { ++ if (!(band->prcs = jas_alloc2(rlvl->numprcs, sizeof(jpc_enc_prc_t)))) { + goto error; + } + for (prcno = 0, prc = band->prcs; prcno < rlvl->numprcs; ++prcno, +@@ -2422,7 +2422,7 @@ if (!rlvlno) { + goto error; + } + +- if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_enc_cblk_t)))) { ++ if (!(prc->cblks = jas_alloc2(prc->numcblks, sizeof(jpc_enc_cblk_t)))) { + goto error; + } + for (cblkno = 0, cblk = prc->cblks; cblkno < prc->numcblks; +diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqdec.c jasper-1.900.1/src/libjasper/jpc/jpc_mqdec.c +--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqdec.c 2007-01-19 22:43:07.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jpc/jpc_mqdec.c 2009-10-22 10:27:45.000000000 +0200 +@@ -118,7 +118,7 @@ jpc_mqdec_t *jpc_mqdec_create(int maxctx + mqdec->in = in; + mqdec->maxctxs = maxctxs; + /* Allocate memory for the per-context state information. */ +- if (!(mqdec->ctxs = jas_malloc(mqdec->maxctxs * sizeof(jpc_mqstate_t *)))) { ++ if (!(mqdec->ctxs = jas_alloc2(mqdec->maxctxs, sizeof(jpc_mqstate_t *)))) { + goto error; + } + /* Set the current context to the first context. */ +diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqenc.c jasper-1.900.1/src/libjasper/jpc/jpc_mqenc.c +--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqenc.c 2007-01-19 22:43:07.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jpc/jpc_mqenc.c 2009-10-22 10:27:45.000000000 +0200 +@@ -197,7 +197,7 @@ jpc_mqenc_t *jpc_mqenc_create(int maxctx + mqenc->maxctxs = maxctxs; + + /* Allocate memory for the per-context state information. */ +- if (!(mqenc->ctxs = jas_malloc(mqenc->maxctxs * sizeof(jpc_mqstate_t *)))) { ++ if (!(mqenc->ctxs = jas_alloc2(mqenc->maxctxs, sizeof(jpc_mqstate_t *)))) { + goto error; + } + +diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_qmfb.c jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c +--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_qmfb.c 2007-01-19 22:43:07.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c 2009-10-22 10:27:45.000000000 +0200 +@@ -321,7 +321,7 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in + #if !defined(HAVE_VLA) + /* Get a buffer. */ + if (bufsize > QMFB_SPLITBUFSIZE) { +- if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) { ++ if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { + /* We have no choice but to commit suicide in this case. */ + abort(); + } +@@ -389,7 +389,7 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in + #if !defined(HAVE_VLA) + /* Get a buffer. */ + if (bufsize > QMFB_SPLITBUFSIZE) { +- if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) { ++ if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { + /* We have no choice but to commit suicide in this case. */ + abort(); + } +@@ -460,7 +460,7 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a, + #if !defined(HAVE_VLA) + /* Get a buffer. */ + if (bufsize > QMFB_SPLITBUFSIZE) { +- if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) { ++ if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { + /* We have no choice but to commit suicide in this case. */ + abort(); + } +@@ -549,7 +549,7 @@ void jpc_qmfb_split_colres(jpc_fix_t *a, + #if !defined(HAVE_VLA) + /* Get a buffer. */ + if (bufsize > QMFB_SPLITBUFSIZE) { +- if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) { ++ if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { + /* We have no choice but to commit suicide in this case. */ + abort(); + } +@@ -633,7 +633,7 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int + #if !defined(HAVE_VLA) + /* Allocate memory for the join buffer from the heap. */ + if (bufsize > QMFB_JOINBUFSIZE) { +- if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) { ++ if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { + /* We have no choice but to commit suicide. */ + abort(); + } +@@ -698,7 +698,7 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int + #if !defined(HAVE_VLA) + /* Allocate memory for the join buffer from the heap. */ + if (bufsize > QMFB_JOINBUFSIZE) { +- if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) { ++ if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { + /* We have no choice but to commit suicide. */ + abort(); + } +@@ -766,7 +766,7 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a, + #if !defined(HAVE_VLA) + /* Allocate memory for the join buffer from the heap. */ + if (bufsize > QMFB_JOINBUFSIZE) { +- if (!(buf = jas_malloc(bufsize * JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) { ++ if (!(buf = jas_alloc2(bufsize, JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) { + /* We have no choice but to commit suicide. */ + abort(); + } +@@ -852,7 +852,7 @@ void jpc_qmfb_join_colres(jpc_fix_t *a, + #if !defined(HAVE_VLA) + /* Allocate memory for the join buffer from the heap. */ + if (bufsize > QMFB_JOINBUFSIZE) { +- if (!(buf = jas_malloc(bufsize * numcols * sizeof(jpc_fix_t)))) { ++ if (!(buf = jas_alloc3(bufsize, numcols, sizeof(jpc_fix_t)))) { + /* We have no choice but to commit suicide. */ + abort(); + } +diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t1enc.c jasper-1.900.1/src/libjasper/jpc/jpc_t1enc.c +--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t1enc.c 2007-01-19 22:43:07.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jpc/jpc_t1enc.c 2009-10-22 10:27:45.000000000 +0200 +@@ -219,7 +219,7 @@ int jpc_enc_enccblk(jpc_enc_t *enc, jas_ + + cblk->numpasses = (cblk->numbps > 0) ? (3 * cblk->numbps - 2) : 0; + if (cblk->numpasses > 0) { +- cblk->passes = jas_malloc(cblk->numpasses * sizeof(jpc_enc_pass_t)); ++ cblk->passes = jas_alloc2(cblk->numpasses, sizeof(jpc_enc_pass_t)); + assert(cblk->passes); + } else { + cblk->passes = 0; +diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2cod.c jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c +--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2cod.c 2007-01-19 22:43:07.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c 2009-10-22 10:27:45.000000000 +0200 +@@ -573,7 +573,7 @@ int jpc_pchglist_insert(jpc_pchglist_t * + } + if (pchglist->numpchgs >= pchglist->maxpchgs) { + newmaxpchgs = pchglist->maxpchgs + 128; +- if (!(newpchgs = jas_realloc(pchglist->pchgs, newmaxpchgs * sizeof(jpc_pchg_t *)))) { ++ if (!(newpchgs = jas_realloc2(pchglist->pchgs, newmaxpchgs, sizeof(jpc_pchg_t *)))) { + return -1; + } + pchglist->maxpchgs = newmaxpchgs; +diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2dec.c jasper-1.900.1/src/libjasper/jpc/jpc_t2dec.c +--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2dec.c 2007-01-19 22:43:07.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jpc/jpc_t2dec.c 2009-10-22 10:27:45.000000000 +0200 +@@ -478,7 +478,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d + return 0; + } + pi->numcomps = dec->numcomps; +- if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) { ++ if (!(pi->picomps = jas_alloc2(pi->numcomps, sizeof(jpc_picomp_t)))) { + jpc_pi_destroy(pi); + return 0; + } +@@ -490,7 +490,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d + for (compno = 0, tcomp = tile->tcomps, picomp = pi->picomps; + compno < pi->numcomps; ++compno, ++tcomp, ++picomp) { + picomp->numrlvls = tcomp->numrlvls; +- if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls * ++ if (!(picomp->pirlvls = jas_alloc2(picomp->numrlvls, + sizeof(jpc_pirlvl_t)))) { + jpc_pi_destroy(pi); + return 0; +@@ -503,7 +503,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d + rlvlno < picomp->numrlvls; ++rlvlno, ++pirlvl, ++rlvl) { + /* XXX sizeof(long) should be sizeof different type */ + pirlvl->numprcs = rlvl->numprcs; +- if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs * ++ if (!(pirlvl->prclyrnos = jas_alloc2(pirlvl->numprcs, + sizeof(long)))) { + jpc_pi_destroy(pi); + return 0; +diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2enc.c jasper-1.900.1/src/libjasper/jpc/jpc_t2enc.c +--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2enc.c 2007-01-19 22:43:07.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jpc/jpc_t2enc.c 2009-10-22 10:27:45.000000000 +0200 +@@ -565,7 +565,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t + } + pi->pktno = -1; + pi->numcomps = cp->numcmpts; +- if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) { ++ if (!(pi->picomps = jas_alloc2(pi->numcomps, sizeof(jpc_picomp_t)))) { + jpc_pi_destroy(pi); + return 0; + } +@@ -577,7 +577,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t + for (compno = 0, tcomp = tile->tcmpts, picomp = pi->picomps; + compno < pi->numcomps; ++compno, ++tcomp, ++picomp) { + picomp->numrlvls = tcomp->numrlvls; +- if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls * ++ if (!(picomp->pirlvls = jas_alloc2(picomp->numrlvls, + sizeof(jpc_pirlvl_t)))) { + jpc_pi_destroy(pi); + return 0; +@@ -591,7 +591,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t + /* XXX sizeof(long) should be sizeof different type */ + pirlvl->numprcs = rlvl->numprcs; + if (rlvl->numprcs) { +- if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs * ++ if (!(pirlvl->prclyrnos = jas_alloc2(pirlvl->numprcs, + sizeof(long)))) { + jpc_pi_destroy(pi); + return 0; +diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_tagtree.c jasper-1.900.1/src/libjasper/jpc/jpc_tagtree.c +--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_tagtree.c 2007-01-19 22:43:07.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jpc/jpc_tagtree.c 2009-10-22 10:27:45.000000000 +0200 +@@ -125,7 +125,7 @@ jpc_tagtree_t *jpc_tagtree_create(int nu + ++numlvls; + } while (n > 1); + +- if (!(tree->nodes_ = jas_malloc(tree->numnodes_ * sizeof(jpc_tagtreenode_t)))) { ++ if (!(tree->nodes_ = jas_alloc2(tree->numnodes_, sizeof(jpc_tagtreenode_t)))) { + return 0; + } + +diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_util.c jasper-1.900.1/src/libjasper/jpc/jpc_util.c +--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_util.c 2007-01-19 22:43:07.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jpc/jpc_util.c 2009-10-22 10:27:45.000000000 +0200 +@@ -109,7 +109,7 @@ int jpc_atoaf(char *s, int *numvalues, d + } + + if (n) { +- if (!(vs = jas_malloc(n * sizeof(double)))) { ++ if (!(vs = jas_alloc2(n, sizeof(double)))) { + return -1; + } + +diff -pruN jasper-1.900.1.orig/src/libjasper/mif/mif_cod.c jasper-1.900.1/src/libjasper/mif/mif_cod.c +--- jasper-1.900.1.orig/src/libjasper/mif/mif_cod.c 2007-01-19 22:43:05.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/mif/mif_cod.c 2009-10-22 10:27:45.000000000 +0200 +@@ -438,8 +438,7 @@ static int mif_hdr_growcmpts(mif_hdr_t * + int cmptno; + mif_cmpt_t **newcmpts; + assert(maxcmpts >= hdr->numcmpts); +- newcmpts = (!hdr->cmpts) ? jas_malloc(maxcmpts * sizeof(mif_cmpt_t *)) : +- jas_realloc(hdr->cmpts, maxcmpts * sizeof(mif_cmpt_t *)); ++ newcmpts = jas_realloc2(hdr->cmpts, maxcmpts, sizeof(mif_cmpt_t *)); + if (!newcmpts) { + return -1; + } diff --git a/main/jasper/jasper-1.900.1-CVE-2008-3522.patch b/main/jasper/jasper-1.900.1-CVE-2008-3522.patch new file mode 100644 index 0000000000..4bf2e9b527 --- /dev/null +++ b/main/jasper/jasper-1.900.1-CVE-2008-3522.patch @@ -0,0 +1,14 @@ +https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3522 + +diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_stream.c jasper-1.900.1/src/libjasper/base/jas_stream.c +--- jasper-1.900.1.orig/src/libjasper/base/jas_stream.c 2009-10-22 10:27:45.000000000 +0200 ++++ jasper-1.900.1/src/libjasper/base/jas_stream.c 2009-10-22 10:35:53.000000000 +0200 +@@ -553,7 +553,7 @@ int jas_stream_printf(jas_stream_t *stre + int ret; + + va_start(ap, fmt); +- ret = vsprintf(buf, fmt, ap); ++ ret = vsnprintf(buf, sizeof buf, fmt, ap); + jas_stream_puts(stream, buf); + va_end(ap); + return ret; diff --git a/main/jasper/jasper-1.900.1-bnc725758.patch b/main/jasper/jasper-1.900.1-bnc725758.patch new file mode 100644 index 0000000000..d2366dfad4 --- /dev/null +++ b/main/jasper/jasper-1.900.1-bnc725758.patch @@ -0,0 +1,25 @@ +diff -up src/libjasper/jpc/jpc_cs.c.orig-725758 src/libjasper/jpc/jpc_cs.c +--- ./src/libjasper/jpc/jpc_cs.c.orig-725758 2011-12-12 18:36:53.772117206 +0100 ++++ ./src/libjasper/jpc/jpc_cs.c 2011-12-12 18:36:12.805999375 +0100 +@@ -744,6 +744,12 @@ static int jpc_cox_getcompparms(jpc_ms_t + return -1; + } + compparms->numrlvls = compparms->numdlvls + 1; ++ if (compparms->numrlvls > JPC_MAXRLVLS) { ++ compparms->numrlvls = 0; ++ jpc_cox_destroycompparms(compparms); ++ return -1; ++ } ++ + if (prtflag) { + for (i = 0; i < compparms->numrlvls; ++i) { + if (jpc_getuint8(in, &tmp)) { +@@ -1331,7 +1337,7 @@ static int jpc_crg_getparms(jpc_ms_t *ms + jpc_crgcomp_t *comp; + uint_fast16_t compno; + crg->numcomps = cstate->numcomps; +- if (!(crg->comps = jas_alloc2(cstate->numcomps, sizeof(uint_fast16_t)))) { ++ if (!(crg->comps = jas_alloc2(cstate->numcomps, sizeof(jpc_crgcomp_t)))) { + return -1; + } + for (compno = 0, comp = crg->comps; compno < cstate->numcomps; diff --git a/main/jasper/libjasper-stepsizes-overflow.patch b/main/jasper/libjasper-stepsizes-overflow.patch new file mode 100644 index 0000000000..097559f68e --- /dev/null +++ b/main/jasper/libjasper-stepsizes-overflow.patch @@ -0,0 +1,14 @@ +--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c 2007-01-19 22:43:07.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jpc/jpc_cs.c 2007-04-06 01:29:02.000000000 +0200 +@@ -982,7 +982,10 @@ static int jpc_qcx_getcompparms(jpc_qcxc + compparms->numstepsizes = (len - n) / 2; + break; + } +- if (compparms->numstepsizes > 0) { ++ if (compparms->numstepsizes > 3 * JPC_MAXRLVLS + 1) { ++ jpc_qcx_destroycompparms(compparms); ++ return -1; ++ } else if (compparms->numstepsizes > 0) { + compparms->stepsizes = jas_malloc(compparms->numstepsizes * + sizeof(uint_fast16_t)); + assert(compparms->stepsizes); diff --git a/main/libc0.9.32/compat-stack-guard.patch b/main/libc0.9.32/0001-Compatible-stack-protector-for-non-Thread-Local-stor.patch index c69a9c5350..b60dd446e7 100644 --- a/main/libc0.9.32/compat-stack-guard.patch +++ b/main/libc0.9.32/0001-Compatible-stack-protector-for-non-Thread-Local-stor.patch @@ -1,5 +1,19 @@ +From 3fb4bfcafbcaff3522e7bab48ff03460fec99023 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Fri, 23 Dec 2011 14:06:09 +0100 +Subject: [PATCH] Compatible stack protector for non Thread Local storage + +Before we had thread local storage the __stack_chk_guard was a global +variable that was referenced to by the older binaries. + +We since then have changed ABI so this patch can probably go away. +--- + ldso/ldso/ldso.c | 7 +------ + libc/misc/internals/__uClibc_main.c | 8 +------- + 2 files changed, 2 insertions(+), 13 deletions(-) + diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c -index 2857f7e..dce6fd8 100644 +index 7ee9257..3585cb7 100644 --- a/ldso/ldso/ldso.c +++ b/ldso/ldso/ldso.c @@ -103,11 +103,7 @@ extern void _start(void); @@ -14,7 +28,7 @@ index 2857f7e..dce6fd8 100644 # ifdef __UCLIBC_HAS_SSP_COMPAT__ uintptr_t __guard attribute_relro; # endif -@@ -953,9 +949,8 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr, +@@ -951,9 +947,8 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr, stack_chk_guard = _dl_setup_stack_chk_guard (); # ifdef THREAD_SET_STACK_GUARD THREAD_SET_STACK_GUARD (stack_chk_guard); @@ -53,3 +67,6 @@ index 315365a..78cd058 100644 # ifdef __UCLIBC_HAS_SSP_COMPAT__ __guard = stack_chk_guard; # endif +-- +1.7.8 + diff --git a/main/libc0.9.32/0002-resolv-res_query-for-CNAMEs.patch b/main/libc0.9.32/0002-resolv-res_query-for-CNAMEs.patch new file mode 100644 index 0000000000..74cd37c505 --- /dev/null +++ b/main/libc0.9.32/0002-resolv-res_query-for-CNAMEs.patch @@ -0,0 +1,41 @@ +From 811e804c7a403783b0c4cc5eb75f24da809081d8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Fri, 23 Dec 2011 14:15:16 +0100 +Subject: [PATCH] resolv: res_query for CNAMEs + +From: http://lists.busybox.net/pipermail/uclibc/2009-June/042583.html + +I had postfix failing for domains with MX->CNAME->A chain. In glibc it works. +I tracked it to be a problem in uclibc res_query. It returns bogus data +for CNAME entries, apparently intentionally, which is wrong. + +glibc return CNAME entries even for CNAME queries and most applications rely +on this. So we should do the same in uclibc. + +Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> +--- + libc/inet/resolv.c | 8 +++----- + 1 files changed, 3 insertions(+), 5 deletions(-) + +diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c +index 021d5bf..2371fb9 100644 +--- a/libc/inet/resolv.c ++++ b/libc/inet/resolv.c +@@ -3099,11 +3099,9 @@ int res_query(const char *dname, int class, int type, + + free(a.dotted); + +- if (a.atype == type) { /* CNAME */ +- if (i > anslen) +- i = anslen; +- memcpy(answer, packet, i); +- } ++ i = MIN(anslen, i); ++ memcpy(answer, packet, i); ++ + free(packet); + return i; + } +-- +1.7.8 + diff --git a/main/libc0.9.32/uclibc-resolv-fix-memory-leak.patch b/main/libc0.9.32/0003-resolv-fix-memory-leak.patch index 8738ba7745..88178e4e0e 100644 --- a/main/libc0.9.32/uclibc-resolv-fix-memory-leak.patch +++ b/main/libc0.9.32/0003-resolv-fix-memory-leak.patch @@ -1,19 +1,23 @@ -From bb8d500a75a3050fe3198773ce7b07f669fe8f13 Mon Sep 17 00:00:00 2001 +From 41e8b28fc02fd966dd089a79dc509a5eff725319 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> -Date: Fri, 14 Oct 2011 15:47:42 +0000 -Subject: resolv: fix memory leak +Date: Fri, 14 Oct 2011 17:47:42 +0200 +Subject: [PATCH] resolv: fix memory leak Timothy Holdener writes: small memory leak in __dns_lookup() when the A record in the DNS answer is preceded by one or more CNAME records. Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> +(cherry picked from commit bb8d500a75a3050fe3198773ce7b07f669fe8f13) --- + libc/inet/resolv.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c -index 38254bd..e415d30 100644 +index 2371fb9..8781196 100644 --- a/libc/inet/resolv.c +++ b/libc/inet/resolv.c -@@ -1507,6 +1507,7 @@ int attribute_hidden __dns_lookup(const char *name, +@@ -1503,6 +1503,7 @@ int attribute_hidden __dns_lookup(const char *name, DPRINTF("Decoding answer at pos %d\n", pos); first_answer = 1; @@ -21,7 +25,7 @@ index 38254bd..e415d30 100644 for (j = 0; j < h.ancount; j++) { i = __decode_answer(packet, pos, packet_len, &ma); if (i < 0) { -@@ -1523,6 +1524,7 @@ int attribute_hidden __dns_lookup(const char *name, +@@ -1519,6 +1520,7 @@ int attribute_hidden __dns_lookup(const char *name, ma.buf = a->buf; ma.buflen = a->buflen; ma.add_count = a->add_count; @@ -29,5 +33,6 @@ index 38254bd..e415d30 100644 memcpy(a, &ma, sizeof(ma)); if (a->atype != T_SIG && (NULL == a->buf || (type != T_A && type != T_AAAA))) break; --- -cgit v0.9.0.1-2-gef13 +-- +1.7.8 + diff --git a/main/libc0.9.32/0001-resolv-fix-resolver-to-return-TRY_AGAIN-on-timeout.patch b/main/libc0.9.32/0004-resolv-fix-resolver-to-return-TRY_AGAIN-on-timeout.patch index 8d6af3deb5..2978ee806a 100644 --- a/main/libc0.9.32/0001-resolv-fix-resolver-to-return-TRY_AGAIN-on-timeout.patch +++ b/main/libc0.9.32/0004-resolv-fix-resolver-to-return-TRY_AGAIN-on-timeout.patch @@ -1,4 +1,4 @@ -From f32b4d27b352724f28c7409490338929fc7ba58f Mon Sep 17 00:00:00 2001 +From d7d9bf8f32235bfa781d632a0a3ba6b544062ce1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> Date: Thu, 7 Jul 2011 18:47:26 +0300 Subject: [PATCH] resolv: fix resolver to return TRY_AGAIN on timeout @@ -23,12 +23,13 @@ to TRY_AGAIN if upstream nameserver(s) timed out. Previously we would have returned NETDB_INTERNAL. Signed-off-by: Timo Teräs <timo.teras@iki.fi> +Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> --- libc/inet/resolv.c | 95 +++++++++++++++++++++++++++------------------------- 1 files changed, 49 insertions(+), 46 deletions(-) diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c -index dc8a752..90ba31c 100644 +index 8781196..07dff18 100644 --- a/libc/inet/resolv.c +++ b/libc/inet/resolv.c @@ -456,7 +456,8 @@ extern int __read_etc_hosts_r(parser_t *parser, @@ -115,7 +116,7 @@ index dc8a752..90ba31c 100644 goto fail1; } pos = HFIXEDSZ; -@@ -1562,8 +1572,7 @@ int attribute_hidden __dns_lookup(const char *name, +@@ -1564,8 +1574,7 @@ int attribute_hidden __dns_lookup(const char *name, variant = -1; } while (retries_left > 0); @@ -125,7 +126,7 @@ index dc8a752..90ba31c 100644 fail1: if (fd != -1) close(fd); -@@ -2104,9 +2113,8 @@ int gethostbyname_r(const char *name, +@@ -2106,9 +2115,8 @@ int gethostbyname_r(const char *name, * we'll need space of one in_addr + two addr_list[] elems */ a.buflen = buflen - ((sizeof(addr_list[0]) * 2 + sizeof(struct in_addr))); a.add_count = 0; @@ -136,7 +137,7 @@ index dc8a752..90ba31c 100644 DPRINTF("__dns_lookup returned < 0\n"); return TRY_AGAIN; } -@@ -2290,9 +2298,8 @@ int gethostbyname2_r(const char *name, +@@ -2292,9 +2300,8 @@ int gethostbyname2_r(const char *name, int packet_len; /* Hmm why we memset(a) to zeros only once? */ @@ -147,7 +148,7 @@ index dc8a752..90ba31c 100644 return TRY_AGAIN; } strncpy(buf, a.dotted, buflen); -@@ -2448,9 +2455,8 @@ int gethostbyaddr_r(const void *addr, socklen_t addrlen, +@@ -2450,9 +2457,8 @@ int gethostbyaddr_r(const void *addr, socklen_t addrlen, memset(&a, '\0', sizeof(a)); for (;;) { /* Hmm why we memset(a) to zeros only once? */ @@ -158,7 +159,7 @@ index dc8a752..90ba31c 100644 return TRY_AGAIN; } -@@ -3089,7 +3095,7 @@ int res_query(const char *dname, int class, int type, +@@ -3091,7 +3097,7 @@ int res_query(const char *dname, int class, int type, } memset(&a, '\0', sizeof(a)); @@ -261,5 +262,5 @@ index dc8a752..90ba31c 100644 /* * Perform a call on res_query on the concatenation of name and domain, -- -1.7.1 +1.7.8 diff --git a/main/libc0.9.32/0001-libm-x86_64-implement-some-fenv-functions.patch b/main/libc0.9.32/0005-libm-x86_64-implement-some-fenv-functions.patch index 5d42413722..9a47267b8e 100644 --- a/main/libc0.9.32/0001-libm-x86_64-implement-some-fenv-functions.patch +++ b/main/libc0.9.32/0005-libm-x86_64-implement-some-fenv-functions.patch @@ -1,9 +1,14 @@ -From 5db70d560df0ab36751045dcb364c3f9eebdc2d1 Mon Sep 17 00:00:00 2001 +From 6864dfeef979985f9f173b842034183476b95583 Mon Sep 17 00:00:00 2001 From: Natanael Copa <natanael.copa@gmail.com> Date: Sun, 28 Nov 2010 12:43:33 +0000 Subject: [PATCH] libm/x86_64: implement some fenv functions from glibc + +Posted to uclibc: +http://lists.busybox.net/pipermail/uclibc/2010-December/044523.html + +Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> --- libm/x86_64/Makefile.arch | 24 ++++++++++++++++++++ libm/x86_64/fclrexcpt.c | 52 ++++++++++++++++++++++++++++++++++++++++++++ @@ -279,5 +284,5 @@ index 0000000..091c251 + return (temp | mxscr) & excepts & FE_ALL_EXCEPT; +} -- -1.7.7 +1.7.8 diff --git a/main/libc0.9.32/0001-ldso-limited-support-for-ORIGIN-in-rpath.patch b/main/libc0.9.32/0006-ldso-limited-support-for-ORIGIN-in-rpath.patch index 73e0fab2bf..633b7e4f58 100644 --- a/main/libc0.9.32/0001-ldso-limited-support-for-ORIGIN-in-rpath.patch +++ b/main/libc0.9.32/0006-ldso-limited-support-for-ORIGIN-in-rpath.patch @@ -1,7 +1,7 @@ -From 0ba7ee452f26088f6b738c37e05c16c7c9eb1caf Mon Sep 17 00:00:00 2001 +From b1aea0b3872b246cf17f04d5442a94e39e45203e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> Date: Fri, 18 Mar 2011 10:53:56 +0200 -Subject: [PATCH 1/3] ldso: limited support for $ORIGIN in rpath +Subject: [PATCH] ldso: limited support for $ORIGIN in rpath MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -9,14 +9,18 @@ Content-Transfer-Encoding: 8bit Handle it if it's in the beginning of the rpath entry as it should be. +Posted to uclibc ml: +http://old.nabble.com/-PATCH-1-3--ldso%3A-limited-support-for-$ORIGIN-in-rpath-td31181219.html + Signed-off-by: Timo Teräs <timo.teras@iki.fi> +Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> --- ldso/ldso/dl-elf.c | 80 ++++++++++++++++++++++++++++----------------------- ldso/ldso/ldso.c | 18 ++++++++++-- 2 files changed, 59 insertions(+), 39 deletions(-) diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c -index 505247e..2b2d429 100644 +index 09b3aaf..558176a 100644 --- a/ldso/ldso/dl-elf.c +++ b/ldso/ldso/dl-elf.c @@ -133,53 +133,60 @@ _dl_protect_relro (struct elf_resolve *l) @@ -158,10 +162,10 @@ index 505247e..2b2d429 100644 return tpnt1; diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c -index 7ee9257..9423670 100644 +index 3585cb7..df16b4f 100644 --- a/ldso/ldso/ldso.c +++ b/ldso/ldso/ldso.c -@@ -272,6 +272,20 @@ static void __attribute__ ((destructor)) __attribute_used__ _dl_fini(void) +@@ -268,6 +268,20 @@ static void __attribute__ ((destructor)) __attribute_used__ _dl_fini(void) } } @@ -182,7 +186,7 @@ index 7ee9257..9423670 100644 void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr, ElfW(auxv_t) auxvt[AT_EGID + 1], char **envp, char **argv -@@ -321,9 +335,7 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr, +@@ -317,9 +331,7 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr, * been fixed up by now. Still no function calls outside of this * library, since the dynamic resolver is not yet ready. */ @@ -194,5 +198,5 @@ index 7ee9257..9423670 100644 if (_start == (void *) auxvt[AT_ENTRY].a_un.a_val) { _dl_dprintf(_dl_debug_file, "Standalone execution is not supported yet\n"); -- -1.7.1 +1.7.8 diff --git a/main/libc0.9.32/0002-stdlib-fix-arc4random-return-type-to-u_int32_t.patch b/main/libc0.9.32/0007-stdlib-fix-arc4random-return-type-to-u_int32_t.patch index 9d924655df..40c938065c 100644 --- a/main/libc0.9.32/0002-stdlib-fix-arc4random-return-type-to-u_int32_t.patch +++ b/main/libc0.9.32/0007-stdlib-fix-arc4random-return-type-to-u_int32_t.patch @@ -1,7 +1,7 @@ -From 70debeff167858502d99e92a221fe14f5428a9b6 Mon Sep 17 00:00:00 2001 +From 8f71a37896be4ce64c009b369117b252eb4de366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> Date: Fri, 18 Mar 2011 10:57:31 +0200 -Subject: [PATCH 2/3] stdlib: fix arc4random return type to u_int32_t +Subject: [PATCH] stdlib: fix arc4random return type to u_int32_t MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -15,6 +15,7 @@ if stdlib.h is included before #define's for stdint.h we end up missing things and breaking builds (e.g. openjdk). Signed-off-by: Timo Teräs <timo.teras@iki.fi> +Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> --- include/stdlib.h | 4 ++-- libc/stdlib/arc4random.c | 3 ++- @@ -57,5 +58,5 @@ index c7aed66..7b9b12d 100644 { if (!rs_initialized) -- -1.7.1 +1.7.8 diff --git a/main/libc0.9.32/0003-ldso-support-RTLD_NOLOAD.patch b/main/libc0.9.32/0008-ldso-support-RTLD_NOLOAD.patch index f10d6f002d..3902df31e7 100644 --- a/main/libc0.9.32/0003-ldso-support-RTLD_NOLOAD.patch +++ b/main/libc0.9.32/0008-ldso-support-RTLD_NOLOAD.patch @@ -1,7 +1,7 @@ -From 4bb377585b95cb67c90ff4ffc21a6870a4e78a37 Mon Sep 17 00:00:00 2001 +From e6fa350aa23280795a912d0edd989d7c98c62710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> Date: Fri, 18 Mar 2011 11:40:04 +0200 -Subject: [PATCH 3/3] ldso: support RTLD_NOLOAD +Subject: [PATCH] ldso: support RTLD_NOLOAD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -10,6 +10,7 @@ So application query if specified modile is loaded or not with dlopen. Signed-off-by: Timo Teräs <timo.teras@iki.fi> +Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> --- ldso/include/dl-elf.h | 6 ++++-- ldso/ldso/dl-elf.c | 30 +++++++++++++++++------------- @@ -19,7 +20,7 @@ Signed-off-by: Timo Teräs <timo.teras@iki.fi> 5 files changed, 29 insertions(+), 20 deletions(-) diff --git a/ldso/include/dl-elf.h b/ldso/include/dl-elf.h -index 7fbb373..7102351 100644 +index e7203fd..753c346 100644 --- a/ldso/include/dl-elf.h +++ b/ldso/include/dl-elf.h @@ -25,16 +25,18 @@ static __inline__ void _dl_map_cache(void) { } @@ -44,7 +45,7 @@ index 7fbb373..7102351 100644 extern struct elf_resolve *_dl_check_if_named_library_is_loaded(const char *full_libname, int trace_loaded_objects); diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c -index 2b2d429..6d35bf2 100644 +index 558176a..e32591a 100644 --- a/ldso/ldso/dl-elf.c +++ b/ldso/ldso/dl-elf.c @@ -132,7 +132,7 @@ _dl_protect_relro (struct elf_resolve *l) @@ -145,7 +146,7 @@ index 2b2d429..6d35bf2 100644 UCLIBC_RUNTIME_PREFIX "lib:" UCLIBC_RUNTIME_PREFIX "usr/lib" #ifndef __LDSO_CACHE_SUPPORT__ -@@ -329,7 +329,7 @@ goof: +@@ -444,7 +444,7 @@ map_writeable (int infile, ElfW(Phdr) *ppnt, int piclib, int flags, * are required. */ @@ -154,7 +155,7 @@ index 2b2d429..6d35bf2 100644 struct dyn_elf **rpnt, char *libname) { ElfW(Ehdr) *epnt; -@@ -368,7 +368,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure, +@@ -483,7 +483,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure, } /* If we are in secure mode (i.e. a setu/gid binary using LD_PRELOAD), we don't load the library if it isn't setuid. */ @@ -163,7 +164,7 @@ index 2b2d429..6d35bf2 100644 if (!(st.st_mode & S_ISUID)) { _dl_close(infile); return NULL; -@@ -384,6 +384,10 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure, +@@ -499,6 +499,10 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure, return tpnt; } } @@ -175,10 +176,10 @@ index 2b2d429..6d35bf2 100644 MAP_PRIVATE | MAP_ANONYMOUS | MAP_UNINITIALIZE, -1, 0); if (_dl_mmap_check_error(header)) { diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c -index 9423670..b71af34 100644 +index df16b4f..5cefc22 100644 --- a/ldso/ldso/ldso.c +++ b/ldso/ldso/ldso.c -@@ -646,7 +646,9 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr, +@@ -642,7 +642,9 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr, if (!_dl_secure || _dl_strchr(str, '/') == NULL) { _dl_if_debug_dprint("\tfile='%s'; needed by '%s'\n", str, _dl_progname); @@ -190,7 +191,7 @@ index 9423670..b71af34 100644 #ifdef __LDSO_LDD_SUPPORT__ if (trace_loaded_objects) diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c -index 68cd579..edf38d2 100644 +index 52c77b0..49e90d0 100644 --- a/ldso/libdl/libdl.c +++ b/ldso/libdl/libdl.c @@ -288,7 +288,7 @@ void *dlopen(const char *libname, int flag) @@ -230,5 +231,5 @@ index 4bfbbff..47b42ad 100644 #endif -- -1.7.1 +1.7.8 diff --git a/main/libc0.9.32/0001-libdl-rudimentary-locking-for-dlopen-dlsym-dlclose.patch b/main/libc0.9.32/0009-libdl-rudimentary-locking-for-dlopen-dlsym-dlclose.patch index d406f030d6..367db170f2 100644 --- a/main/libc0.9.32/0001-libdl-rudimentary-locking-for-dlopen-dlsym-dlclose.patch +++ b/main/libc0.9.32/0009-libdl-rudimentary-locking-for-dlopen-dlsym-dlclose.patch @@ -1,6 +1,6 @@ -From 521807eb4d18c5e693f91ad53cb277c76aab8686 Mon Sep 17 00:00:00 2001 +From e3f3de389e28f2585d1a1e57989440ffea67e689 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Thu, 24 Mar 2011 13:24:32 +0200 +Date: Thu, 24 Mar 2011 13:27:36 +0200 Subject: [PATCH] libdl: rudimentary locking for dlopen/dlsym/dlclose MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -12,6 +12,8 @@ we can use more fine grained locking or even RCU where appropriate. But at least we won't crash now. Signed-off-by: Timo Teräs <timo.teras@iki.fi> +Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> +(cherry picked from commit f69319d5a7d3a3ccb46b28ee2b0fd9053c6415ac) --- TODO | 1 + ldso/libdl/libdl.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++---- @@ -30,7 +32,7 @@ index ae305a5..95cabd5 100644 diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c -index 68cd579..e007f54 100644 +index 49e90d0..8b243c6 100644 --- a/ldso/libdl/libdl.c +++ b/ldso/libdl/libdl.c @@ -34,6 +34,7 @@ @@ -61,7 +63,7 @@ index 68cd579..e007f54 100644 { struct elf_resolve *tpnt, *tfrom; struct dyn_elf *dyn_chain, *rpnt = NULL, *dyn_ptr, *relro_ptr, *handle; -@@ -605,7 +610,18 @@ oops: +@@ -606,7 +611,18 @@ oops: return NULL; } @@ -81,7 +83,7 @@ index 68cd579..e007f54 100644 { struct elf_resolve *tpnt, *tfrom; struct dyn_elf *handle; -@@ -653,7 +669,7 @@ void *dlsym(void *vhandle, const char *name) +@@ -654,7 +670,7 @@ void *dlsym(void *vhandle, const char *name) * dynamic loader itself, as it doesn't know * how to properly treat it. */ @@ -90,7 +92,7 @@ index 68cd579..e007f54 100644 tfrom = NULL; for (rpnt = _dl_symbol_tables; rpnt; rpnt = rpnt->next) { -@@ -690,6 +706,17 @@ out: +@@ -691,6 +707,17 @@ out: return ret; } @@ -108,7 +110,7 @@ index 68cd579..e007f54 100644 #if 0 void *dlvsym(void *vhandle, const char *name, const char *version) { -@@ -957,7 +984,13 @@ static int do_dlclose(void *vhandle, int need_fini) +@@ -958,7 +985,13 @@ static int do_dlclose(void *vhandle, int need_fini) int dlclose(void *vhandle) { @@ -123,7 +125,7 @@ index 68cd579..e007f54 100644 } char *dlerror(void) -@@ -1004,7 +1037,7 @@ int dlinfo(void) +@@ -1005,7 +1038,7 @@ int dlinfo(void) return 0; } @@ -132,7 +134,7 @@ index 68cd579..e007f54 100644 { struct elf_resolve *pelf; struct elf_resolve *rpnt; -@@ -1108,3 +1141,14 @@ int dladdr(const void *__address, Dl_info * __info) +@@ -1117,3 +1150,14 @@ int dladdr(const void *__address, Dl_info * __info) } } #endif @@ -148,5 +150,5 @@ index 68cd579..e007f54 100644 + return ret; +} -- -1.7.1 +1.7.8 diff --git a/main/libc0.9.32/0001-malloc-standard-synchronize-on-fork.patch b/main/libc0.9.32/0010-malloc-standard-synchronize-on-fork.patch index eb3bfbe04f..688231f777 100644 --- a/main/libc0.9.32/0001-malloc-standard-synchronize-on-fork.patch +++ b/main/libc0.9.32/0010-malloc-standard-synchronize-on-fork.patch @@ -1,4 +1,4 @@ -From 168215f9c3ec4ec9a2fad9387038ced8b386ebaa Mon Sep 17 00:00:00 2001 +From 1bdf3d74afad552ff99182af70536f23549a434f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> Date: Sat, 26 Mar 2011 20:23:09 +0200 Subject: [PATCH] malloc-standard: synchronize on fork @@ -10,6 +10,7 @@ Otherwise other threads can leave malloc state locked, and the child will hang indefinitely if it tries to malloc something. Signed-off-by: Timo Teräs <timo.teras@iki.fi> +Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> --- libc/stdlib/malloc-standard/free.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) @@ -50,5 +51,5 @@ index 39e54d6..df512cc 100644 -- -1.7.1 +1.7.8 diff --git a/main/libc0.9.32/0001-time-fix-parsing-of-tzdata-files-where-off_t-is-64-b.patch b/main/libc0.9.32/0011-time-fix-parsing-of-tzdata-files-where-off_t-is-64-b.patch index e47d89620c..63ee369af6 100644 --- a/main/libc0.9.32/0001-time-fix-parsing-of-tzdata-files-where-off_t-is-64-b.patch +++ b/main/libc0.9.32/0011-time-fix-parsing-of-tzdata-files-where-off_t-is-64-b.patch @@ -1,6 +1,5 @@ -From ef44545eb332eac26577ea2672e89b01b3aa5706 Mon Sep 17 00:00:00 2001 +From 0be0174259a3a35313fe1a0413630b919f910f5b Mon Sep 17 00:00:00 2001 From: William Pitcock <nenolod@dereferenced.org> -To: uclibc@uclibc.org Date: Thu, 28 Apr 2011 03:09:20 -0500 Subject: [PATCH] time: fix parsing of tzdata files where off_t is 64-bit @@ -10,6 +9,7 @@ gcc to pass the constant as off_t type always by casting the constant to off_t. Signed-off-by: William Pitcock <nenolod@dereferenced.org> +Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> --- libc/misc/time/time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) @@ -28,5 +28,5 @@ index 19d68e1..1b21f9e 100644 goto ERROR; } -- -1.7.4.5 +1.7.8 diff --git a/main/libc0.9.32/0001-getaddrinfo-allow-numeric-service-without-any-hints.patch b/main/libc0.9.32/0012-getaddrinfo-allow-numeric-service-without-any-hints.patch index bdd3ce4892..2cb303a943 100644 --- a/main/libc0.9.32/0001-getaddrinfo-allow-numeric-service-without-any-hints.patch +++ b/main/libc0.9.32/0012-getaddrinfo-allow-numeric-service-without-any-hints.patch @@ -1,6 +1,6 @@ -From 66cdddf50492b9b645200ef580ae957c388694ab Mon Sep 17 00:00:00 2001 +From eb5d129b641c644d82089c3ded3d36288c66123c Mon Sep 17 00:00:00 2001 From: Natanael Copa <natanael.copa@gmail.com> -Date: Wed, 8 Jun 2011 09:12:16 +0000 +Date: Sun, 12 Jun 2011 12:09:04 +0000 Subject: [PATCH] getaddrinfo: allow numeric service without any hints This appears to correspond to what glibc does and this fixes an @@ -10,6 +10,10 @@ issue with iptables-1.4.11 with udp and raw port numbers. This fixes #3841 https://bugs.busybox.net/show_bug.cgi?id=3841 + +Signed-off-by: Natanael Copa <natanael.copa@gmail.com> +Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> +(cherry picked from commit bc3be18145e4d57e7268506f123c0f0f373a15e2) --- libc/inet/getaddrinfo.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) @@ -33,5 +37,5 @@ index 1a77c51..e7511f6 100644 pservice = &gaih_service; } else -- -1.7.5.4 +1.7.8 diff --git a/main/libc0.9.32/0001-libc-x86-fix-stack-unwinding-and-backtrace-informati.patch b/main/libc0.9.32/0013-libc-x86-fix-stack-unwinding-and-backtrace-informati.patch index 62c1456949..d8961b2bc2 100644 --- a/main/libc0.9.32/0001-libc-x86-fix-stack-unwinding-and-backtrace-informati.patch +++ b/main/libc0.9.32/0013-libc-x86-fix-stack-unwinding-and-backtrace-informati.patch @@ -1,7 +1,7 @@ -From 5f72f80e7ea0e3429c28ff5de7ca88cdd95e8904 Mon Sep 17 00:00:00 2001 +From 9d28002b230eb01a5db7aecab263d38bf0d6d6c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> Date: Thu, 10 Nov 2011 09:36:44 +0200 -Subject: [PATCHv2] libc/x86: fix stack unwinding and backtrace information +Subject: [PATCH] libc/x86: fix stack unwinding and backtrace information MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -25,6 +25,7 @@ if thread is cancelled and the cancellation handler fails to detect the signal return frame. Signed-off-by: Timo Teräs <timo.teras@iki.fi> +Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> --- libc/sysdeps/linux/i386/bits/syscalls.h | 82 +++---------------------------- libc/sysdeps/linux/i386/clone.S | 17 ++++++ @@ -246,5 +247,5 @@ index de0c75d..f9af3f7 100644 " popl %eax\n" \ " movl $" #syscall ", %eax\n" \ -- -1.7.7 +1.7.8 diff --git a/main/libc0.9.32/libm-cabsf.patch b/main/libc0.9.32/0014-libm-add-cabsf-and-cabsl-functions.patch index 5ffa11455e..cb19a9f954 100644 --- a/main/libc0.9.32/libm-cabsf.patch +++ b/main/libc0.9.32/0014-libm-add-cabsf-and-cabsl-functions.patch @@ -1,9 +1,11 @@ -From 0c71b7626655c1023c5e10ebb3b1a294f8e41353 Mon Sep 17 00:00:00 2001 +From aee19ef04c6abf52f4fd646269fcf8a8609164f9 Mon Sep 17 00:00:00 2001 From: William Pitcock <nenolod@dereferenced.org> Date: Tue, 1 Nov 2011 18:55:25 -0500 -Subject: [PATCH 2/2] libm: add cabsf() and cabsl() functions. +Subject: [PATCH] libm: add cabsf() and cabsl() functions. Signed-off-by: William Pitcock <nenolod@dereferenced.org> +Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> +(cherry picked from commit 2086015b9a223586c1a2b8d7f015ad3a38bdf8bc) --- libm/w_cabs.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) @@ -33,5 +35,5 @@ index 4044f4b..b259248 100644 +libm_hidden_def(cabsl) +#endif -- -1.7.7.1 +1.7.8 diff --git a/main/libc0.9.32/libm-cexp.patch b/main/libc0.9.32/0015-libm-implement-generic-cexp-cexpf-and-cexpl.patch index 82f914fa95..1ac2316580 100644 --- a/main/libc0.9.32/libm-cexp.patch +++ b/main/libc0.9.32/0015-libm-implement-generic-cexp-cexpf-and-cexpl.patch @@ -1,12 +1,14 @@ -From 8733cd43293bfa04b4334db7873c4de613f5cf75 Mon Sep 17 00:00:00 2001 +From bf95401faf3ec57b5f45ada41dc219f6d04770ae Mon Sep 17 00:00:00 2001 From: William Pitcock <nenolod@dereferenced.org> Date: Tue, 1 Nov 2011 18:41:30 -0500 -Subject: [PATCH 1/2] libm: implement generic cexp(), cexpf() and cexpl(). +Subject: [PATCH] libm: implement generic cexp(), cexpf() and cexpl(). The cexp*() family of functions is defined by the C99 math standard as implementing exponential functions for complex types. Signed-off-by: William Pitcock <nenolod@dereferenced.org> +Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> +(cherry picked from commit 6471fc450b66dcb1ba16fe6568cd52221ca64cd1) --- libm/Makefile.in | 3 +- libm/cexp.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -97,5 +99,5 @@ index 0000000..87512b7 +libm_hidden_def(cexpl) +#endif -- -1.7.7.1 +1.7.8 diff --git a/main/libc0.9.32/0016-libubacktrace-use-.so.-ABI_VERSION.patch b/main/libc0.9.32/0016-libubacktrace-use-.so.-ABI_VERSION.patch new file mode 100644 index 0000000000..bf43e927a9 --- /dev/null +++ b/main/libc0.9.32/0016-libubacktrace-use-.so.-ABI_VERSION.patch @@ -0,0 +1,29 @@ +From 5ca71ddc69ebb3696b63d260e15341653ddef4c0 Mon Sep 17 00:00:00 2001 +From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> +Date: Fri, 18 Nov 2011 08:49:25 +0100 +Subject: [PATCH] libubacktrace: use .so.$(ABI_VERSION) + +Thanks to William Pitcock for noticing + +Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> +(cherry picked from commit 69cba61dd27f2a9c4c34f596ed9d1b7cd0441f74) +--- + Rules.mak | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Rules.mak b/Rules.mak +index fe06c24..96074e5 100644 +--- a/Rules.mak ++++ b/Rules.mak +@@ -118,7 +118,7 @@ export MAJOR_VERSION MINOR_VERSION SUBLEVEL VERSION ABI_VERSION LC_ALL + + LIBC := libc + SHARED_LIBNAME := $(LIBC).so.$(ABI_VERSION) +-UBACKTRACE_DSO := libubacktrace.so.$(MAJOR_VERSION) ++UBACKTRACE_DSO := libubacktrace.so.$(ABI_VERSION) + ifneq ($(findstring $(TARGET_ARCH) , hppa64 ia64 mips64 powerpc64 s390x sparc64 x86_64 ),) + UCLIBC_LDSO_NAME := ld64-uClibc + ARCH_NATIVE_BIT := 64 +-- +1.7.8 + diff --git a/main/libc0.9.32/0017-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch b/main/libc0.9.32/0017-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch new file mode 100644 index 0000000000..2377bccbd8 --- /dev/null +++ b/main/libc0.9.32/0017-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch @@ -0,0 +1,44 @@ +From 08164f6a9e839918fa6bae05572916c2defabd94 Mon Sep 17 00:00:00 2001 +From: Phil Blundell <pb@pbcl.net> +Date: Sat, 11 Jun 2011 01:10:46 -0400 +Subject: [PATCH] Fix __libc_epoll_pwait compile failure on x86 + +This prevents "memory input 7 is not directly addressable" errors. + +| libc/sysdeps/linux/common/epoll.c: In function '__libc_epoll_pwait': +| libc/sysdeps/linux/common/epoll.c:71:80: error: memory input 7 is not directly addressable +| libc/sysdeps/linux/common/epoll.c:75:86: error: memory input 7 is not directly addressable +| make: *** [libc/sysdeps/linux/common/epoll.o] Error 1 +| make: *** Waiting for unfinished jobs.... + +Signed-off-by: Phil Blundell <pb@pbcl.net> +Signed-off-by: Jason Woodward <jason.woodward@timesys.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +(cherry picked from commit 8245f3b4638fdff2011c2657af1bb211def704bc) +--- + libc/sysdeps/linux/common/epoll.c | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/libc/sysdeps/linux/common/epoll.c b/libc/sysdeps/linux/common/epoll.c +index 85b0cfd..ab3e73b 100644 +--- a/libc/sysdeps/linux/common/epoll.c ++++ b/libc/sysdeps/linux/common/epoll.c +@@ -67,12 +67,13 @@ extern __typeof(epoll_pwait) __libc_epoll_pwait; + int __libc_epoll_pwait(int epfd, struct epoll_event *events, int maxevents, + int timeout, const sigset_t *set) + { ++ int nsig = _NSIG / 8; + if (SINGLE_THREAD_P) +- return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8); ++ return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, nsig); + # ifdef __UCLIBC_HAS_THREADS_NATIVE__ + else { + int oldtype = LIBC_CANCEL_ASYNC (); +- int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8); ++ int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, nsig); + LIBC_CANCEL_RESET (oldtype); + return result; + } +-- +1.7.8 + diff --git a/main/libc0.9.32/0018-libcrypt-do-not-cast-away-const-of-key-salt.patch b/main/libc0.9.32/0018-libcrypt-do-not-cast-away-const-of-key-salt.patch new file mode 100644 index 0000000000..d79671739b --- /dev/null +++ b/main/libc0.9.32/0018-libcrypt-do-not-cast-away-const-of-key-salt.patch @@ -0,0 +1,34 @@ +From c6363f33f5af361fea483dd6a7e0f42278f913bf Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sun, 20 Nov 2011 02:34:49 -0500 +Subject: [PATCH] libcrypt: do not cast away const of key/salt + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +(cherry picked from commit 4a2b0641a3818ad14b886907368b6f6735615f6d) +--- + libcrypt/crypt.c | 7 +++++-- + 1 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/libcrypt/crypt.c b/libcrypt/crypt.c +index 8b361d3..89a2614 100644 +--- a/libcrypt/crypt.c ++++ b/libcrypt/crypt.c +@@ -12,10 +12,13 @@ + + char *crypt(const char *key, const char *salt) + { ++ const unsigned char *ukey = (const unsigned char *)key; ++ const unsigned char *usalt = (const unsigned char *)salt; ++ + /* First, check if we are supposed to be using the MD5 replacement + * instead of DES... */ + if (salt[0]=='$' && salt[1]=='1' && salt[2]=='$') +- return __md5_crypt((unsigned char*)key, (unsigned char*)salt); ++ return __md5_crypt(ukey, usalt); + else +- return __des_crypt((unsigned char*)key, (unsigned char*)salt); ++ return __des_crypt(ukey, usalt); + } +-- +1.7.8 + diff --git a/main/libc0.9.32/0019-libcrypt-make-crypt-itself-more-modular.patch b/main/libc0.9.32/0019-libcrypt-make-crypt-itself-more-modular.patch new file mode 100644 index 0000000000..9e8636f95a --- /dev/null +++ b/main/libc0.9.32/0019-libcrypt-make-crypt-itself-more-modular.patch @@ -0,0 +1,64 @@ +From 78f25c8abfc3358a46061772944d30027ceb8288 Mon Sep 17 00:00:00 2001 +From: William Pitcock <nenolod@dereferenced.org> +Date: Mon, 19 Dec 2011 01:21:33 -0600 +Subject: [PATCH] libcrypt: make crypt() itself more modular + +By using a function table, we can more cleanly support new crypt +implementations, such as SHA256 ($5$) and SHA512 ($6$). + +Signed-off-by: William Pitcock <nenolod@dereferenced.org> +Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> +(cherry picked from commit 40c426ae8f032d794d15f4a7fca8dc17cdc9899d) +--- + libcrypt/crypt.c | 30 ++++++++++++++++++++++++------ + 1 files changed, 24 insertions(+), 6 deletions(-) + +diff --git a/libcrypt/crypt.c b/libcrypt/crypt.c +index 89a2614..33f98b6 100644 +--- a/libcrypt/crypt.c ++++ b/libcrypt/crypt.c +@@ -8,17 +8,35 @@ + #define __FORCE_GLIBC + #include <crypt.h> + #include <unistd.h> ++#include <string.h> ++#include <errno.h> + #include "libcrypt.h" + ++typedef char *(*crypt_impl_f)(const unsigned char *pw, const unsigned char *salt); ++ ++static const struct { ++ const char *salt_pfx; ++ const crypt_impl_f crypt_impl; ++} crypt_impl_tab[] = { ++ { "$1$", __md5_crypt }, ++ { NULL, __des_crypt }, ++}; ++ + char *crypt(const char *key, const char *salt) + { + const unsigned char *ukey = (const unsigned char *)key; + const unsigned char *usalt = (const unsigned char *)salt; ++ size_t i; ++ ++ for (i = 0; i < ARRAY_SIZE(crypt_impl_tab); i++) { ++ if (crypt_impl_tab[i].salt_pfx != NULL && ++ strncmp(crypt_impl_tab[i].salt_pfx, salt, strlen(crypt_impl_tab[i].salt_pfx))) ++ continue; ++ ++ return crypt_impl_tab[i].crypt_impl(ukey, usalt); ++ } + +- /* First, check if we are supposed to be using the MD5 replacement +- * instead of DES... */ +- if (salt[0]=='$' && salt[1]=='1' && salt[2]=='$') +- return __md5_crypt(ukey, usalt); +- else +- return __des_crypt(ukey, usalt); ++ /* no crypt implementation was found, set errno to ENOSYS and return NULL */ ++ __set_errno(ENOSYS); ++ return NULL; + } +-- +1.7.8 + diff --git a/main/libc0.9.32/0020-libcrypt-add-support-for-SHA512-CRYPT-password-hashi.patch b/main/libc0.9.32/0020-libcrypt-add-support-for-SHA512-CRYPT-password-hashi.patch new file mode 100644 index 0000000000..cd67869775 --- /dev/null +++ b/main/libc0.9.32/0020-libcrypt-add-support-for-SHA512-CRYPT-password-hashi.patch @@ -0,0 +1,834 @@ +From 0b68c872deb676b0cb104bfb30a1f356072b5edf Mon Sep 17 00:00:00 2001 +From: William Pitcock <nenolod@dereferenced.org> +Date: Mon, 19 Dec 2011 01:24:16 -0600 +Subject: [PATCH] libcrypt: add support for SHA512-CRYPT password hashing + +This is based on Ulrich Drepper's implementation in GLIBC, but hacked up to work +in uClibc. The differences from the GLIBC version are as follows: + +- b64_from_24bit() has been converted into a macro +- Usage of GLIBC-isms (such as libc_freeres_ptr) have been removed + +It is enabled by the UCLIBC_HAS_SHA512_CRYPT_IMPL configuration symbol. You must +have UCLIBC_HAS_CRYPT_IMPL enabled as well. + +Signed-off-by: William Pitcock <nenolod@dereferenced.org> +Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> +(cherry picked from commit 4c24dabb9cea4c8148d7a7efc7a1df694424c483) +--- + extra/Configs/Config.in | 7 + + libcrypt/Makefile.in | 1 + + libcrypt/crypt.c | 3 + + libcrypt/libcrypt.h | 3 + + libcrypt/sha512-crypt.c | 339 +++++++++++++++++++++++++++++++++++++++++++++++ + libcrypt/sha512.c | 326 +++++++++++++++++++++++++++++++++++++++++++++ + libcrypt/sha512.h | 58 ++++++++ + 7 files changed, 737 insertions(+), 0 deletions(-) + create mode 100644 libcrypt/sha512-crypt.c + create mode 100644 libcrypt/sha512.c + create mode 100644 libcrypt/sha512.h + +diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in +index e41adc4..eec3ee9 100644 +--- a/extra/Configs/Config.in ++++ b/extra/Configs/Config.in +@@ -1137,6 +1137,13 @@ config UCLIBC_HAS_CRYPT_IMPL + help + libcrypt contains crypt(), setkey() and encrypt() + ++config UCLIBC_HAS_SHA512_CRYPT_IMPL ++ bool "libcrypt SHA512 support" ++ depends on UCLIBC_HAS_CRYPT_IMPL ++ help ++ This adds support for SHA512 password hashing via the crypt() function. ++ Say N here if you do not need SHA512 crypt support. ++ + config UCLIBC_HAS_CRYPT_STUB + bool "libcrypt stubs" + default y +diff --git a/libcrypt/Makefile.in b/libcrypt/Makefile.in +index 1d1fb55..2fceaed 100644 +--- a/libcrypt/Makefile.in ++++ b/libcrypt/Makefile.in +@@ -21,6 +21,7 @@ libcrypt_OUT := $(top_builddir)libcrypt + + libcrypt_SRC-y := + libcrypt_SRC-$(UCLIBC_HAS_CRYPT_IMPL) += crypt.c des.c md5.c ++libcrypt_SRC-$(UCLIBC_HAS_SHA512_CRYPT_IMPL) += sha512.c sha512-crypt.c + libcrypt_SRC-$(UCLIBC_HAS_CRYPT_STUB) += crypt_stub.c + + libcrypt_SRC := $(addprefix $(libcrypt_DIR)/,$(libcrypt_SRC-y)) +diff --git a/libcrypt/crypt.c b/libcrypt/crypt.c +index 33f98b6..b5bf9ee 100644 +--- a/libcrypt/crypt.c ++++ b/libcrypt/crypt.c +@@ -19,6 +19,9 @@ static const struct { + const crypt_impl_f crypt_impl; + } crypt_impl_tab[] = { + { "$1$", __md5_crypt }, ++#ifdef __UCLIBC_HAS_SHA512_CRYPT_IMPL__ ++ { "$6$", __sha512_crypt }, ++#endif + { NULL, __des_crypt }, + }; + +diff --git a/libcrypt/libcrypt.h b/libcrypt/libcrypt.h +index 1186620..fcad6ae 100644 +--- a/libcrypt/libcrypt.h ++++ b/libcrypt/libcrypt.h +@@ -9,8 +9,11 @@ + #define __LIBCRYPT_H__ + + extern char *__md5_crypt(const unsigned char *pw, const unsigned char *salt) attribute_hidden; ++extern char *__sha512_crypt(const unsigned char *pw, const unsigned char *salt) attribute_hidden; + extern char *__des_crypt(const unsigned char *pw, const unsigned char *salt) attribute_hidden; + ++extern char *__sha512_crypt_r (const char *key, const char *salt, char *buffer, int buflen) attribute_hidden; ++ + /* shut up gcc-4.x signed warnings */ + #define strcpy(dst,src) strcpy((char*)dst,(char*)src) + #define strlen(s) strlen((char*)s) +diff --git a/libcrypt/sha512-crypt.c b/libcrypt/sha512-crypt.c +new file mode 100644 +index 0000000..0321be0 +--- /dev/null ++++ b/libcrypt/sha512-crypt.c +@@ -0,0 +1,339 @@ ++/* One way encryption based on SHA512 sum. ++ Copyright (C) 2007, 2009 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ Contributed by Ulrich Drepper <drepper@redhat.com>, 2007. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, write to the Free ++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ++ 02111-1307 USA. */ ++ ++#include <assert.h> ++#include <errno.h> ++#include <stdbool.h> ++#include <stdlib.h> ++#include <string.h> ++#include <sys/param.h> ++ ++#include "sha512.h" ++#include "libcrypt.h" ++ ++/* Define our magic string to mark salt for SHA512 "encryption" ++ replacement. */ ++static const char sha512_salt_prefix[] = "$6$"; ++ ++/* Prefix for optional rounds specification. */ ++static const char sha512_rounds_prefix[] = "rounds="; ++ ++/* Maximum salt string length. */ ++#define SALT_LEN_MAX 16 ++/* Default number of rounds if not explicitly specified. */ ++#define ROUNDS_DEFAULT 5000 ++/* Minimum number of rounds. */ ++#define ROUNDS_MIN 1000 ++/* Maximum number of rounds. */ ++#define ROUNDS_MAX 999999999 ++ ++/* Table with characters for base64 transformation. */ ++static const char b64t[64] = ++"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; ++ ++#define B64_FROM_24BIT(b2, b1, b0, steps) \ ++ { \ ++ int n = (steps); \ ++ unsigned int w = ((b2) << 16) | ((b1) << 8) | (b0); \ ++ while (n-- > 0 && buflen > 0) \ ++ { \ ++ *cp++ = b64t[w & 0x3f]; \ ++ --buflen; \ ++ w >>= 6; \ ++ } \ ++ } ++ ++char * ++__sha512_crypt_r (const char *key, ++ const char *salt, ++ char *buffer, ++ int buflen) ++{ ++ unsigned char alt_result[64] ++ __attribute__ ((__aligned__ (__alignof__ (uint64_t)))); ++ unsigned char temp_result[64] ++ __attribute__ ((__aligned__ (__alignof__ (uint64_t)))); ++ size_t salt_len; ++ size_t key_len; ++ size_t cnt; ++ char *cp; ++ char *copied_key = NULL; ++ char *copied_salt = NULL; ++ char *p_bytes; ++ char *s_bytes; ++ /* Default number of rounds. */ ++ size_t rounds = ROUNDS_DEFAULT; ++ bool rounds_custom = false; ++ ++ /* Find beginning of salt string. The prefix should normally always ++ be present. Just in case it is not. */ ++ if (strncmp (sha512_salt_prefix, salt, sizeof (sha512_salt_prefix) - 1) == 0) ++ /* Skip salt prefix. */ ++ salt += sizeof (sha512_salt_prefix) - 1; ++ ++ if (strncmp (salt, sha512_rounds_prefix, sizeof (sha512_rounds_prefix) - 1) ++ == 0) ++ { ++ const char *num = salt + sizeof (sha512_rounds_prefix) - 1; ++ char *endp; ++ unsigned long int srounds = strtoul (num, &endp, 10); ++ if (*endp == '$') ++ { ++ salt = endp + 1; ++ rounds = MAX (ROUNDS_MIN, MIN (srounds, ROUNDS_MAX)); ++ rounds_custom = true; ++ } ++ } ++ ++ salt_len = MIN (strcspn (salt, "$"), SALT_LEN_MAX); ++ key_len = strlen (key); ++ ++ if ((key - (char *) 0) % __alignof__ (uint64_t) != 0) ++ { ++ char *tmp = (char *) alloca (key_len + __alignof__ (uint64_t)); ++ key = copied_key = ++ memcpy (tmp + __alignof__ (uint64_t) ++ - (tmp - (char *) 0) % __alignof__ (uint64_t), ++ key, key_len); ++ assert ((key - (char *) 0) % __alignof__ (uint64_t) == 0); ++ } ++ ++ if ((salt - (char *) 0) % __alignof__ (uint64_t) != 0) ++ { ++ char *tmp = (char *) alloca (salt_len + __alignof__ (uint64_t)); ++ salt = copied_salt = ++ memcpy (tmp + __alignof__ (uint64_t) ++ - (tmp - (char *) 0) % __alignof__ (uint64_t), ++ salt, salt_len); ++ assert ((salt - (char *) 0) % __alignof__ (uint64_t) == 0); ++ } ++ ++ struct sha512_ctx ctx; ++ struct sha512_ctx alt_ctx; ++ ++ /* Prepare for the real work. */ ++ __sha512_init_ctx (&ctx); ++ ++ /* Add the key string. */ ++ __sha512_process_bytes (key, key_len, &ctx); ++ ++ /* The last part is the salt string. This must be at most 16 ++ characters and it ends at the first `$' character. */ ++ __sha512_process_bytes (salt, salt_len, &ctx); ++ ++ ++ /* Compute alternate SHA512 sum with input KEY, SALT, and KEY. The ++ final result will be added to the first context. */ ++ __sha512_init_ctx (&alt_ctx); ++ ++ /* Add key. */ ++ __sha512_process_bytes (key, key_len, &alt_ctx); ++ ++ /* Add salt. */ ++ __sha512_process_bytes (salt, salt_len, &alt_ctx); ++ ++ /* Add key again. */ ++ __sha512_process_bytes (key, key_len, &alt_ctx); ++ ++ /* Now get result of this (64 bytes) and add it to the other ++ context. */ ++ __sha512_finish_ctx (&alt_ctx, alt_result); ++ ++ /* Add for any character in the key one byte of the alternate sum. */ ++ for (cnt = key_len; cnt > 64; cnt -= 64) ++ __sha512_process_bytes (alt_result, 64, &ctx); ++ ++ __sha512_process_bytes (alt_result, cnt, &ctx); ++ ++ /* Take the binary representation of the length of the key and for every ++ 1 add the alternate sum, for every 0 the key. */ ++ for (cnt = key_len; cnt > 0; cnt >>= 1) ++ if ((cnt & 1) != 0) ++ __sha512_process_bytes (alt_result, 64, &ctx); ++ else ++ __sha512_process_bytes (key, key_len, &ctx); ++ ++ /* Create intermediate result. */ ++ __sha512_finish_ctx (&ctx, alt_result); ++ ++ /* Start computation of P byte sequence. */ ++ __sha512_init_ctx (&alt_ctx); ++ ++ /* For every character in the password add the entire password. */ ++ for (cnt = 0; cnt < key_len; ++cnt) ++ __sha512_process_bytes (key, key_len, &alt_ctx); ++ ++ /* Finish the digest. */ ++ __sha512_finish_ctx (&alt_ctx, temp_result); ++ ++ /* Create byte sequence P. */ ++ cp = p_bytes = alloca (key_len); ++ for (cnt = key_len; cnt >= 64; cnt -= 64) ++ cp = mempcpy (cp, temp_result, 64); ++ memcpy (cp, temp_result, cnt); ++ ++ /* Start computation of S byte sequence. */ ++ __sha512_init_ctx (&alt_ctx); ++ ++ /* For every character in the password add the entire password. */ ++ for (cnt = 0; cnt < 16 + alt_result[0]; ++cnt) ++ __sha512_process_bytes (salt, salt_len, &alt_ctx); ++ ++ /* Finish the digest. */ ++ __sha512_finish_ctx (&alt_ctx, temp_result); ++ ++ /* Create byte sequence S. */ ++ cp = s_bytes = alloca (salt_len); ++ for (cnt = salt_len; cnt >= 64; cnt -= 64) ++ cp = mempcpy (cp, temp_result, 64); ++ memcpy (cp, temp_result, cnt); ++ ++ /* Repeatedly run the collected hash value through SHA512 to burn ++ CPU cycles. */ ++ for (cnt = 0; cnt < rounds; ++cnt) ++ { ++ /* New context. */ ++ __sha512_init_ctx (&ctx); ++ ++ /* Add key or last result. */ ++ if ((cnt & 1) != 0) ++ __sha512_process_bytes (p_bytes, key_len, &ctx); ++ else ++ __sha512_process_bytes (alt_result, 64, &ctx); ++ ++ /* Add salt for numbers not divisible by 3. */ ++ if (cnt % 3 != 0) ++ __sha512_process_bytes (s_bytes, salt_len, &ctx); ++ ++ /* Add key for numbers not divisible by 7. */ ++ if (cnt % 7 != 0) ++ __sha512_process_bytes (p_bytes, key_len, &ctx); ++ ++ /* Add key or last result. */ ++ if ((cnt & 1) != 0) ++ __sha512_process_bytes (alt_result, 64, &ctx); ++ else ++ __sha512_process_bytes (p_bytes, key_len, &ctx); ++ ++ /* Create intermediate result. */ ++ __sha512_finish_ctx (&ctx, alt_result); ++ } ++ ++ /* Now we can construct the result string. It consists of three ++ parts. */ ++ cp = stpncpy (buffer, sha512_salt_prefix, MAX (0, buflen)); ++ buflen -= sizeof (sha512_salt_prefix) - 1; ++ ++ if (rounds_custom) ++ { ++ int n = snprintf (cp, MAX (0, buflen), "%s%zu$", ++ sha512_rounds_prefix, rounds); ++ cp += n; ++ buflen -= n; ++ } ++ ++ cp = stpncpy (cp, salt, MIN ((size_t) MAX (0, buflen), salt_len)); ++ buflen -= MIN ((size_t) MAX (0, buflen), salt_len); ++ ++ if (buflen > 0) ++ { ++ *cp++ = '$'; ++ --buflen; ++ } ++ ++ B64_FROM_24BIT (alt_result[0], alt_result[21], alt_result[42], 4); ++ B64_FROM_24BIT (alt_result[22], alt_result[43], alt_result[1], 4); ++ B64_FROM_24BIT (alt_result[44], alt_result[2], alt_result[23], 4); ++ B64_FROM_24BIT (alt_result[3], alt_result[24], alt_result[45], 4); ++ B64_FROM_24BIT (alt_result[25], alt_result[46], alt_result[4], 4); ++ B64_FROM_24BIT (alt_result[47], alt_result[5], alt_result[26], 4); ++ B64_FROM_24BIT (alt_result[6], alt_result[27], alt_result[48], 4); ++ B64_FROM_24BIT (alt_result[28], alt_result[49], alt_result[7], 4); ++ B64_FROM_24BIT (alt_result[50], alt_result[8], alt_result[29], 4); ++ B64_FROM_24BIT (alt_result[9], alt_result[30], alt_result[51], 4); ++ B64_FROM_24BIT (alt_result[31], alt_result[52], alt_result[10], 4); ++ B64_FROM_24BIT (alt_result[53], alt_result[11], alt_result[32], 4); ++ B64_FROM_24BIT (alt_result[12], alt_result[33], alt_result[54], 4); ++ B64_FROM_24BIT (alt_result[34], alt_result[55], alt_result[13], 4); ++ B64_FROM_24BIT (alt_result[56], alt_result[14], alt_result[35], 4); ++ B64_FROM_24BIT (alt_result[15], alt_result[36], alt_result[57], 4); ++ B64_FROM_24BIT (alt_result[37], alt_result[58], alt_result[16], 4); ++ B64_FROM_24BIT (alt_result[59], alt_result[17], alt_result[38], 4); ++ B64_FROM_24BIT (alt_result[18], alt_result[39], alt_result[60], 4); ++ B64_FROM_24BIT (alt_result[40], alt_result[61], alt_result[19], 4); ++ B64_FROM_24BIT (alt_result[62], alt_result[20], alt_result[41], 4); ++ B64_FROM_24BIT (0, 0, alt_result[63], 2); ++ ++ if (buflen <= 0) ++ { ++ __set_errno (ERANGE); ++ buffer = NULL; ++ } ++ else ++ *cp = '\0'; /* Terminate the string. */ ++ ++ /* Clear the buffer for the intermediate result so that people ++ attaching to processes or reading core dumps cannot get any ++ information. We do it in this way to clear correct_words[] ++ inside the SHA512 implementation as well. */ ++ __sha512_init_ctx (&ctx); ++ __sha512_finish_ctx (&ctx, alt_result); ++ memset (&ctx, '\0', sizeof (ctx)); ++ memset (&alt_ctx, '\0', sizeof (alt_ctx)); ++ ++ memset (temp_result, '\0', sizeof (temp_result)); ++ memset (p_bytes, '\0', key_len); ++ memset (s_bytes, '\0', salt_len); ++ if (copied_key != NULL) ++ memset (copied_key, '\0', key_len); ++ if (copied_salt != NULL) ++ memset (copied_salt, '\0', salt_len); ++ ++ return buffer; ++} ++ ++static char *buffer; ++ ++/* This entry point is equivalent to the `crypt' function in Unix ++ libcs. */ ++char * ++__sha512_crypt (const unsigned char *key, const unsigned char *salt) ++{ ++ /* We don't want to have an arbitrary limit in the size of the ++ password. We can compute an upper bound for the size of the ++ result in advance and so we can prepare the buffer we pass to ++ `sha512_crypt_r'. */ ++ static int buflen; ++ int needed = (sizeof (sha512_salt_prefix) - 1 ++ + sizeof (sha512_rounds_prefix) + 9 + 1 ++ + strlen (salt) + 1 + 86 + 1); ++ ++ if (buflen < needed) ++ { ++ char *new_buffer = (char *) realloc (buffer, needed); ++ if (new_buffer == NULL) ++ return NULL; ++ ++ buffer = new_buffer; ++ buflen = needed; ++ } ++ ++ return __sha512_crypt_r ((const char *) key, (const char *) salt, buffer, buflen); ++} +diff --git a/libcrypt/sha512.c b/libcrypt/sha512.c +new file mode 100644 +index 0000000..04e0a06 +--- /dev/null ++++ b/libcrypt/sha512.c +@@ -0,0 +1,326 @@ ++/* Functions to compute SHA512 message digest of files or memory blocks. ++ according to the definition of SHA512 in FIPS 180-2. ++ Copyright (C) 2007 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, write to the Free ++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ++ 02111-1307 USA. */ ++ ++/* Written by Ulrich Drepper <drepper@redhat.com>, 2007. */ ++ ++#ifdef HAVE_CONFIG_H ++# include <config.h> ++#endif ++ ++#include <endian.h> ++#include <stdlib.h> ++#include <string.h> ++#include <sys/types.h> ++ ++#include "sha512.h" ++ ++#if __BYTE_ORDER == __LITTLE_ENDIAN ++# ifdef _LIBC ++# include <byteswap.h> ++# define SWAP(n) bswap_64 (n) ++# else ++# define SWAP(n) \ ++ (((n) << 56) \ ++ | (((n) & 0xff00) << 40) \ ++ | (((n) & 0xff0000) << 24) \ ++ | (((n) & 0xff000000) << 8) \ ++ | (((n) >> 8) & 0xff000000) \ ++ | (((n) >> 24) & 0xff0000) \ ++ | (((n) >> 40) & 0xff00) \ ++ | ((n) >> 56)) ++# endif ++#else ++# define SWAP(n) (n) ++#endif ++ ++ ++/* This array contains the bytes used to pad the buffer to the next ++ 64-byte boundary. (FIPS 180-2:5.1.2) */ ++static const unsigned char fillbuf[128] = { 0x80, 0 /* , 0, 0, ... */ }; ++ ++ ++/* Constants for SHA512 from FIPS 180-2:4.2.3. */ ++static const uint64_t K[80] = ++ { ++ UINT64_C (0x428a2f98d728ae22), UINT64_C (0x7137449123ef65cd), ++ UINT64_C (0xb5c0fbcfec4d3b2f), UINT64_C (0xe9b5dba58189dbbc), ++ UINT64_C (0x3956c25bf348b538), UINT64_C (0x59f111f1b605d019), ++ UINT64_C (0x923f82a4af194f9b), UINT64_C (0xab1c5ed5da6d8118), ++ UINT64_C (0xd807aa98a3030242), UINT64_C (0x12835b0145706fbe), ++ UINT64_C (0x243185be4ee4b28c), UINT64_C (0x550c7dc3d5ffb4e2), ++ UINT64_C (0x72be5d74f27b896f), UINT64_C (0x80deb1fe3b1696b1), ++ UINT64_C (0x9bdc06a725c71235), UINT64_C (0xc19bf174cf692694), ++ UINT64_C (0xe49b69c19ef14ad2), UINT64_C (0xefbe4786384f25e3), ++ UINT64_C (0x0fc19dc68b8cd5b5), UINT64_C (0x240ca1cc77ac9c65), ++ UINT64_C (0x2de92c6f592b0275), UINT64_C (0x4a7484aa6ea6e483), ++ UINT64_C (0x5cb0a9dcbd41fbd4), UINT64_C (0x76f988da831153b5), ++ UINT64_C (0x983e5152ee66dfab), UINT64_C (0xa831c66d2db43210), ++ UINT64_C (0xb00327c898fb213f), UINT64_C (0xbf597fc7beef0ee4), ++ UINT64_C (0xc6e00bf33da88fc2), UINT64_C (0xd5a79147930aa725), ++ UINT64_C (0x06ca6351e003826f), UINT64_C (0x142929670a0e6e70), ++ UINT64_C (0x27b70a8546d22ffc), UINT64_C (0x2e1b21385c26c926), ++ UINT64_C (0x4d2c6dfc5ac42aed), UINT64_C (0x53380d139d95b3df), ++ UINT64_C (0x650a73548baf63de), UINT64_C (0x766a0abb3c77b2a8), ++ UINT64_C (0x81c2c92e47edaee6), UINT64_C (0x92722c851482353b), ++ UINT64_C (0xa2bfe8a14cf10364), UINT64_C (0xa81a664bbc423001), ++ UINT64_C (0xc24b8b70d0f89791), UINT64_C (0xc76c51a30654be30), ++ UINT64_C (0xd192e819d6ef5218), UINT64_C (0xd69906245565a910), ++ UINT64_C (0xf40e35855771202a), UINT64_C (0x106aa07032bbd1b8), ++ UINT64_C (0x19a4c116b8d2d0c8), UINT64_C (0x1e376c085141ab53), ++ UINT64_C (0x2748774cdf8eeb99), UINT64_C (0x34b0bcb5e19b48a8), ++ UINT64_C (0x391c0cb3c5c95a63), UINT64_C (0x4ed8aa4ae3418acb), ++ UINT64_C (0x5b9cca4f7763e373), UINT64_C (0x682e6ff3d6b2b8a3), ++ UINT64_C (0x748f82ee5defb2fc), UINT64_C (0x78a5636f43172f60), ++ UINT64_C (0x84c87814a1f0ab72), UINT64_C (0x8cc702081a6439ec), ++ UINT64_C (0x90befffa23631e28), UINT64_C (0xa4506cebde82bde9), ++ UINT64_C (0xbef9a3f7b2c67915), UINT64_C (0xc67178f2e372532b), ++ UINT64_C (0xca273eceea26619c), UINT64_C (0xd186b8c721c0c207), ++ UINT64_C (0xeada7dd6cde0eb1e), UINT64_C (0xf57d4f7fee6ed178), ++ UINT64_C (0x06f067aa72176fba), UINT64_C (0x0a637dc5a2c898a6), ++ UINT64_C (0x113f9804bef90dae), UINT64_C (0x1b710b35131c471b), ++ UINT64_C (0x28db77f523047d84), UINT64_C (0x32caab7b40c72493), ++ UINT64_C (0x3c9ebe0a15c9bebc), UINT64_C (0x431d67c49c100d4c), ++ UINT64_C (0x4cc5d4becb3e42b6), UINT64_C (0x597f299cfc657e2a), ++ UINT64_C (0x5fcb6fab3ad6faec), UINT64_C (0x6c44198c4a475817) ++ }; ++ ++ ++/* Process LEN bytes of BUFFER, accumulating context into CTX. ++ It is assumed that LEN % 128 == 0. */ ++static void ++sha512_process_block (const void *buffer, size_t len, struct sha512_ctx *ctx) ++{ ++ const uint64_t *words = buffer; ++ size_t nwords = len / sizeof (uint64_t); ++ uint64_t a = ctx->H[0]; ++ uint64_t b = ctx->H[1]; ++ uint64_t c = ctx->H[2]; ++ uint64_t d = ctx->H[3]; ++ uint64_t e = ctx->H[4]; ++ uint64_t f = ctx->H[5]; ++ uint64_t g = ctx->H[6]; ++ uint64_t h = ctx->H[7]; ++ ++ /* First increment the byte count. FIPS 180-2 specifies the possible ++ length of the file up to 2^128 bits. Here we only compute the ++ number of bytes. Do a double word increment. */ ++ ctx->total[0] += len; ++ if (ctx->total[0] < len) ++ ++ctx->total[1]; ++ ++ /* Process all bytes in the buffer with 128 bytes in each round of ++ the loop. */ ++ while (nwords > 0) ++ { ++ uint64_t W[80]; ++ uint64_t a_save = a; ++ uint64_t b_save = b; ++ uint64_t c_save = c; ++ uint64_t d_save = d; ++ uint64_t e_save = e; ++ uint64_t f_save = f; ++ uint64_t g_save = g; ++ uint64_t h_save = h; ++ ++ /* Operators defined in FIPS 180-2:4.1.2. */ ++#define Ch(x, y, z) ((x & y) ^ (~x & z)) ++#define Maj(x, y, z) ((x & y) ^ (x & z) ^ (y & z)) ++#define S0(x) (CYCLIC (x, 28) ^ CYCLIC (x, 34) ^ CYCLIC (x, 39)) ++#define S1(x) (CYCLIC (x, 14) ^ CYCLIC (x, 18) ^ CYCLIC (x, 41)) ++#define R0(x) (CYCLIC (x, 1) ^ CYCLIC (x, 8) ^ (x >> 7)) ++#define R1(x) (CYCLIC (x, 19) ^ CYCLIC (x, 61) ^ (x >> 6)) ++ ++ /* It is unfortunate that C does not provide an operator for ++ cyclic rotation. Hope the C compiler is smart enough. */ ++#define CYCLIC(w, s) ((w >> s) | (w << (64 - s))) ++ ++ /* Compute the message schedule according to FIPS 180-2:6.3.2 step 2. */ ++ for (unsigned int t = 0; t < 16; ++t) ++ { ++ W[t] = SWAP (*words); ++ ++words; ++ } ++ for (unsigned int t = 16; t < 80; ++t) ++ W[t] = R1 (W[t - 2]) + W[t - 7] + R0 (W[t - 15]) + W[t - 16]; ++ ++ /* The actual computation according to FIPS 180-2:6.3.2 step 3. */ ++ for (unsigned int t = 0; t < 80; ++t) ++ { ++ uint64_t T1 = h + S1 (e) + Ch (e, f, g) + K[t] + W[t]; ++ uint64_t T2 = S0 (a) + Maj (a, b, c); ++ h = g; ++ g = f; ++ f = e; ++ e = d + T1; ++ d = c; ++ c = b; ++ b = a; ++ a = T1 + T2; ++ } ++ ++ /* Add the starting values of the context according to FIPS 180-2:6.3.2 ++ step 4. */ ++ a += a_save; ++ b += b_save; ++ c += c_save; ++ d += d_save; ++ e += e_save; ++ f += f_save; ++ g += g_save; ++ h += h_save; ++ ++ /* Prepare for the next round. */ ++ nwords -= 16; ++ } ++ ++ /* Put checksum in context given as argument. */ ++ ctx->H[0] = a; ++ ctx->H[1] = b; ++ ctx->H[2] = c; ++ ctx->H[3] = d; ++ ctx->H[4] = e; ++ ctx->H[5] = f; ++ ctx->H[6] = g; ++ ctx->H[7] = h; ++} ++ ++ ++/* Initialize structure containing state of computation. ++ (FIPS 180-2:5.3.3) */ ++void ++__sha512_init_ctx (struct sha512_ctx *ctx) ++{ ++ ctx->H[0] = UINT64_C (0x6a09e667f3bcc908); ++ ctx->H[1] = UINT64_C (0xbb67ae8584caa73b); ++ ctx->H[2] = UINT64_C (0x3c6ef372fe94f82b); ++ ctx->H[3] = UINT64_C (0xa54ff53a5f1d36f1); ++ ctx->H[4] = UINT64_C (0x510e527fade682d1); ++ ctx->H[5] = UINT64_C (0x9b05688c2b3e6c1f); ++ ctx->H[6] = UINT64_C (0x1f83d9abfb41bd6b); ++ ctx->H[7] = UINT64_C (0x5be0cd19137e2179); ++ ++ ctx->total[0] = ctx->total[1] = 0; ++ ctx->buflen = 0; ++} ++ ++ ++/* Process the remaining bytes in the internal buffer and the usual ++ prolog according to the standard and write the result to RESBUF. ++ ++ IMPORTANT: On some systems it is required that RESBUF is correctly ++ aligned for a 32 bits value. */ ++void * ++__sha512_finish_ctx (struct sha512_ctx *ctx, void *resbuf) ++{ ++ /* Take yet unprocessed bytes into account. */ ++ uint64_t bytes = ctx->buflen; ++ size_t pad; ++ ++ /* Now count remaining bytes. */ ++ ctx->total[0] += bytes; ++ if (ctx->total[0] < bytes) ++ ++ctx->total[1]; ++ ++ pad = bytes >= 112 ? 128 + 112 - bytes : 112 - bytes; ++ memcpy (&ctx->buffer[bytes], fillbuf, pad); ++ ++ /* Put the 128-bit file length in *bits* at the end of the buffer. */ ++ *(uint64_t *) &ctx->buffer[bytes + pad + 8] = SWAP (ctx->total[0] << 3); ++ *(uint64_t *) &ctx->buffer[bytes + pad] = SWAP ((ctx->total[1] << 3) | ++ (ctx->total[0] >> 61)); ++ ++ /* Process last bytes. */ ++ sha512_process_block (ctx->buffer, bytes + pad + 16, ctx); ++ ++ /* Put result from CTX in first 64 bytes following RESBUF. */ ++ for (unsigned int i = 0; i < 8; ++i) ++ ((uint64_t *) resbuf)[i] = SWAP (ctx->H[i]); ++ ++ return resbuf; ++} ++ ++ ++void ++__sha512_process_bytes (const void *buffer, size_t len, struct sha512_ctx *ctx) ++{ ++ /* When we already have some bits in our internal buffer concatenate ++ both inputs first. */ ++ if (ctx->buflen != 0) ++ { ++ size_t left_over = ctx->buflen; ++ size_t add = 256 - left_over > len ? len : 256 - left_over; ++ ++ memcpy (&ctx->buffer[left_over], buffer, add); ++ ctx->buflen += add; ++ ++ if (ctx->buflen > 128) ++ { ++ sha512_process_block (ctx->buffer, ctx->buflen & ~127, ctx); ++ ++ ctx->buflen &= 127; ++ /* The regions in the following copy operation cannot overlap. */ ++ memcpy (ctx->buffer, &ctx->buffer[(left_over + add) & ~127], ++ ctx->buflen); ++ } ++ ++ buffer = (const char *) buffer + add; ++ len -= add; ++ } ++ ++ /* Process available complete blocks. */ ++ if (len >= 128) ++ { ++#if __GNUC__ >= 2 ++# define UNALIGNED_P(p) (((uintptr_t) p) % __alignof__ (uint64_t) != 0) ++#else ++# define UNALIGNED_P(p) (((uintptr_t) p) % sizeof (uint64_t) != 0) ++#endif ++ if (UNALIGNED_P (buffer)) ++ while (len > 128) ++ { ++ sha512_process_block (memcpy (ctx->buffer, buffer, 128), 128, ++ ctx); ++ buffer = (const char *) buffer + 128; ++ len -= 128; ++ } ++ else ++ { ++ sha512_process_block (buffer, len & ~127, ctx); ++ buffer = (const char *) buffer + (len & ~127); ++ len &= 127; ++ } ++ } ++ ++ /* Move remaining bytes into internal buffer. */ ++ if (len > 0) ++ { ++ size_t left_over = ctx->buflen; ++ ++ memcpy (&ctx->buffer[left_over], buffer, len); ++ left_over += len; ++ if (left_over >= 128) ++ { ++ sha512_process_block (ctx->buffer, 128, ctx); ++ left_over -= 128; ++ memcpy (ctx->buffer, &ctx->buffer[128], left_over); ++ } ++ ctx->buflen = left_over; ++ } ++} +diff --git a/libcrypt/sha512.h b/libcrypt/sha512.h +new file mode 100644 +index 0000000..5777827 +--- /dev/null ++++ b/libcrypt/sha512.h +@@ -0,0 +1,58 @@ ++/* Declaration of functions and data types used for SHA512 sum computing ++ library functions. ++ Copyright (C) 2007 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, write to the Free ++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ++ 02111-1307 USA. */ ++ ++#ifndef _SHA512_H ++#define _SHA512_H 1 ++ ++#include <limits.h> ++#include <stdint.h> ++#include <stdio.h> ++ ++ ++/* Structure to save state of computation between the single steps. */ ++struct sha512_ctx ++{ ++ uint64_t H[8]; ++ ++ uint64_t total[2]; ++ uint64_t buflen; ++ char buffer[256] __attribute__ ((__aligned__ (__alignof__ (uint64_t)))); ++}; ++ ++/* Initialize structure containing state of computation. ++ (FIPS 180-2: 5.3.3) */ ++extern void __sha512_init_ctx (struct sha512_ctx *ctx) attribute_hidden; ++ ++/* Starting with the result of former calls of this function (or the ++ initialization function update the context for the next LEN bytes ++ starting at BUFFER. ++ It is NOT required that LEN is a multiple of 128. */ ++extern void __sha512_process_bytes (const void *buffer, size_t len, ++ struct sha512_ctx *ctx) attribute_hidden; ++ ++/* Process the remaining bytes in the buffer and put result from CTX ++ in first 64 bytes following RESBUF. ++ ++ IMPORTANT: On some systems it is required that RESBUF is correctly ++ aligned for a 64 bits value. */ ++extern void *__sha512_finish_ctx (struct sha512_ctx *ctx, void *resbuf) ++ attribute_hidden; ++ ++#endif /* sha512.h */ +-- +1.7.8 + diff --git a/main/libc0.9.32/0021-libcrypt-add-support-for-SHA256-CRYPT-password-hashi.patch b/main/libc0.9.32/0021-libcrypt-add-support-for-SHA256-CRYPT-password-hashi.patch new file mode 100644 index 0000000000..b49e6da810 --- /dev/null +++ b/main/libc0.9.32/0021-libcrypt-add-support-for-SHA256-CRYPT-password-hashi.patch @@ -0,0 +1,789 @@ +From 243a437f9345fd7182bb4b2f60d892cc86794e8d Mon Sep 17 00:00:00 2001 +From: William Pitcock <nenolod@dereferenced.org> +Date: Mon, 19 Dec 2011 01:25:09 -0600 +Subject: [PATCH] libcrypt: add support for SHA256-CRYPT password hashing + +This is based on Ulrich Drepper's implementation in GLIBC, but hacked up to work +in uClibc. The differences from the GLIBC version are as follows: + +- b64_from_24bit() has been converted into a macro +- Usage of GLIBC-isms (such as libc_freeres_ptr) have been removed + +It is enabled by the UCLIBC_HAS_SHA256_CRYPT_IMPL configuration symbol. You must +have UCLIBC_HAS_CRYPT_IMPL enabled as well. + +Signed-off-by: William Pitcock <nenolod@dereferenced.org> +Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> +(cherry picked from commit 3ac5fd7ecaeb6721d812c2b93e446bf9a31acdde) +--- + extra/Configs/Config.in | 7 + + libcrypt/Makefile.in | 1 + + libcrypt/crypt.c | 3 + + libcrypt/libcrypt.h | 2 + + libcrypt/sha256-crypt.c | 326 +++++++++++++++++++++++++++++++++++++++++++++++ + libcrypt/sha256.c | 294 ++++++++++++++++++++++++++++++++++++++++++ + libcrypt/sha256.h | 58 +++++++++ + 7 files changed, 691 insertions(+), 0 deletions(-) + create mode 100644 libcrypt/sha256-crypt.c + create mode 100644 libcrypt/sha256.c + create mode 100644 libcrypt/sha256.h + +diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in +index eec3ee9..66e4efb 100644 +--- a/extra/Configs/Config.in ++++ b/extra/Configs/Config.in +@@ -1137,6 +1137,13 @@ config UCLIBC_HAS_CRYPT_IMPL + help + libcrypt contains crypt(), setkey() and encrypt() + ++config UCLIBC_HAS_SHA256_CRYPT_IMPL ++ bool "libcrypt SHA256 support" ++ depends on UCLIBC_HAS_CRYPT_IMPL ++ help ++ This adds support for SHA256 password hashing via the crypt() function. ++ Say N here if you do not need SHA256 crypt support. ++ + config UCLIBC_HAS_SHA512_CRYPT_IMPL + bool "libcrypt SHA512 support" + depends on UCLIBC_HAS_CRYPT_IMPL +diff --git a/libcrypt/Makefile.in b/libcrypt/Makefile.in +index 2fceaed..94753f4 100644 +--- a/libcrypt/Makefile.in ++++ b/libcrypt/Makefile.in +@@ -21,6 +21,7 @@ libcrypt_OUT := $(top_builddir)libcrypt + + libcrypt_SRC-y := + libcrypt_SRC-$(UCLIBC_HAS_CRYPT_IMPL) += crypt.c des.c md5.c ++libcrypt_SRC-$(UCLIBC_HAS_SHA256_CRYPT_IMPL) += sha256.c sha256-crypt.c + libcrypt_SRC-$(UCLIBC_HAS_SHA512_CRYPT_IMPL) += sha512.c sha512-crypt.c + libcrypt_SRC-$(UCLIBC_HAS_CRYPT_STUB) += crypt_stub.c + +diff --git a/libcrypt/crypt.c b/libcrypt/crypt.c +index b5bf9ee..188a6a0 100644 +--- a/libcrypt/crypt.c ++++ b/libcrypt/crypt.c +@@ -19,6 +19,9 @@ static const struct { + const crypt_impl_f crypt_impl; + } crypt_impl_tab[] = { + { "$1$", __md5_crypt }, ++#ifdef __UCLIBC_HAS_SHA256_CRYPT_IMPL__ ++ { "$5$", __sha256_crypt }, ++#endif + #ifdef __UCLIBC_HAS_SHA512_CRYPT_IMPL__ + { "$6$", __sha512_crypt }, + #endif +diff --git a/libcrypt/libcrypt.h b/libcrypt/libcrypt.h +index fcad6ae..67733d1 100644 +--- a/libcrypt/libcrypt.h ++++ b/libcrypt/libcrypt.h +@@ -9,9 +9,11 @@ + #define __LIBCRYPT_H__ + + extern char *__md5_crypt(const unsigned char *pw, const unsigned char *salt) attribute_hidden; ++extern char *__sha256_crypt(const unsigned char *pw, const unsigned char *salt) attribute_hidden; + extern char *__sha512_crypt(const unsigned char *pw, const unsigned char *salt) attribute_hidden; + extern char *__des_crypt(const unsigned char *pw, const unsigned char *salt) attribute_hidden; + ++extern char *__sha256_crypt_r (const char *key, const char *salt, char *buffer, int buflen) attribute_hidden; + extern char *__sha512_crypt_r (const char *key, const char *salt, char *buffer, int buflen) attribute_hidden; + + /* shut up gcc-4.x signed warnings */ +diff --git a/libcrypt/sha256-crypt.c b/libcrypt/sha256-crypt.c +new file mode 100644 +index 0000000..4422148 +--- /dev/null ++++ b/libcrypt/sha256-crypt.c +@@ -0,0 +1,326 @@ ++/* One way encryption based on SHA256 sum. ++ Copyright (C) 2007, 2009 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ Contributed by Ulrich Drepper <drepper@redhat.com>, 2007. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, write to the Free ++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ++ 02111-1307 USA. */ ++ ++#include <assert.h> ++#include <errno.h> ++#include <stdbool.h> ++#include <stdlib.h> ++#include <string.h> ++#include <sys/param.h> ++ ++#include "sha256.h" ++#include "libcrypt.h" ++ ++/* Define our magic string to mark salt for SHA256 "encryption" ++ replacement. */ ++static const char sha256_salt_prefix[] = "$5$"; ++ ++/* Prefix for optional rounds specification. */ ++static const char sha256_rounds_prefix[] = "rounds="; ++ ++/* Maximum salt string length. */ ++#define SALT_LEN_MAX 16 ++/* Default number of rounds if not explicitly specified. */ ++#define ROUNDS_DEFAULT 5000 ++/* Minimum number of rounds. */ ++#define ROUNDS_MIN 1000 ++/* Maximum number of rounds. */ ++#define ROUNDS_MAX 999999999 ++ ++/* Table with characters for base64 transformation. */ ++static const char b64t[64] = ++"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; ++ ++#define B64_FROM_24BIT(b2, b1, b0, steps) \ ++ { \ ++ int n = (steps); \ ++ unsigned int w = ((b2) << 16) | ((b1) << 8) | (b0); \ ++ while (n-- > 0 && buflen > 0) \ ++ { \ ++ *cp++ = b64t[w & 0x3f]; \ ++ --buflen; \ ++ w >>= 6; \ ++ } \ ++ } ++ ++char * ++__sha256_crypt_r (const char *key, ++ const char *salt, ++ char *buffer, ++ int buflen) ++{ ++ unsigned char alt_result[32] ++ __attribute__ ((__aligned__ (__alignof__ (uint32_t)))); ++ unsigned char temp_result[32] ++ __attribute__ ((__aligned__ (__alignof__ (uint32_t)))); ++ size_t salt_len; ++ size_t key_len; ++ size_t cnt; ++ char *cp; ++ char *copied_key = NULL; ++ char *copied_salt = NULL; ++ char *p_bytes; ++ char *s_bytes; ++ /* Default number of rounds. */ ++ size_t rounds = ROUNDS_DEFAULT; ++ bool rounds_custom = false; ++ ++ /* Find beginning of salt string. The prefix should normally always ++ be present. Just in case it is not. */ ++ if (strncmp (sha256_salt_prefix, salt, sizeof (sha256_salt_prefix) - 1) == 0) ++ /* Skip salt prefix. */ ++ salt += sizeof (sha256_salt_prefix) - 1; ++ ++ if (strncmp (salt, sha256_rounds_prefix, sizeof (sha256_rounds_prefix) - 1) ++ == 0) ++ { ++ const char *num = salt + sizeof (sha256_rounds_prefix) - 1; ++ char *endp; ++ unsigned long int srounds = strtoul (num, &endp, 10); ++ if (*endp == '$') ++ { ++ salt = endp + 1; ++ rounds = MAX (ROUNDS_MIN, MIN (srounds, ROUNDS_MAX)); ++ rounds_custom = true; ++ } ++ } ++ ++ salt_len = MIN (strcspn (salt, "$"), SALT_LEN_MAX); ++ key_len = strlen (key); ++ ++ if ((key - (char *) 0) % __alignof__ (uint32_t) != 0) ++ { ++ char *tmp = (char *) alloca (key_len + __alignof__ (uint32_t)); ++ key = copied_key = ++ memcpy (tmp + __alignof__ (uint32_t) ++ - (tmp - (char *) 0) % __alignof__ (uint32_t), ++ key, key_len); ++ assert ((key - (char *) 0) % __alignof__ (uint32_t) == 0); ++ } ++ ++ if ((salt - (char *) 0) % __alignof__ (uint32_t) != 0) ++ { ++ char *tmp = (char *) alloca (salt_len + __alignof__ (uint32_t)); ++ salt = copied_salt = ++ memcpy (tmp + __alignof__ (uint32_t) ++ - (tmp - (char *) 0) % __alignof__ (uint32_t), ++ salt, salt_len); ++ assert ((salt - (char *) 0) % __alignof__ (uint32_t) == 0); ++ } ++ ++ struct sha256_ctx ctx; ++ struct sha256_ctx alt_ctx; ++ ++ /* Prepare for the real work. */ ++ __sha256_init_ctx (&ctx); ++ ++ /* Add the key string. */ ++ __sha256_process_bytes (key, key_len, &ctx); ++ ++ /* The last part is the salt string. This must be at most 16 ++ characters and it ends at the first `$' character. */ ++ __sha256_process_bytes (salt, salt_len, &ctx); ++ ++ ++ /* Compute alternate SHA256 sum with input KEY, SALT, and KEY. The ++ final result will be added to the first context. */ ++ __sha256_init_ctx (&alt_ctx); ++ ++ /* Add key. */ ++ __sha256_process_bytes (key, key_len, &alt_ctx); ++ ++ /* Add salt. */ ++ __sha256_process_bytes (salt, salt_len, &alt_ctx); ++ ++ /* Add key again. */ ++ __sha256_process_bytes (key, key_len, &alt_ctx); ++ ++ /* Now get result of this (32 bytes) and add it to the other ++ context. */ ++ __sha256_finish_ctx (&alt_ctx, alt_result); ++ ++ /* Add for any character in the key one byte of the alternate sum. */ ++ for (cnt = key_len; cnt > 32; cnt -= 32) ++ __sha256_process_bytes (alt_result, 32, &ctx); ++ __sha256_process_bytes (alt_result, cnt, &ctx); ++ ++ /* Take the binary representation of the length of the key and for every ++ 1 add the alternate sum, for every 0 the key. */ ++ for (cnt = key_len; cnt > 0; cnt >>= 1) ++ if ((cnt & 1) != 0) ++ __sha256_process_bytes (alt_result, 32, &ctx); ++ else ++ __sha256_process_bytes (key, key_len, &ctx); ++ ++ /* Create intermediate result. */ ++ __sha256_finish_ctx (&ctx, alt_result); ++ ++ /* Start computation of P byte sequence. */ ++ __sha256_init_ctx (&alt_ctx); ++ ++ /* For every character in the password add the entire password. */ ++ for (cnt = 0; cnt < key_len; ++cnt) ++ __sha256_process_bytes (key, key_len, &alt_ctx); ++ ++ /* Finish the digest. */ ++ __sha256_finish_ctx (&alt_ctx, temp_result); ++ ++ /* Create byte sequence P. */ ++ cp = p_bytes = alloca (key_len); ++ for (cnt = key_len; cnt >= 32; cnt -= 32) ++ cp = mempcpy (cp, temp_result, 32); ++ memcpy (cp, temp_result, cnt); ++ ++ /* Start computation of S byte sequence. */ ++ __sha256_init_ctx (&alt_ctx); ++ ++ /* For every character in the password add the entire password. */ ++ for (cnt = 0; cnt < 16 + alt_result[0]; ++cnt) ++ __sha256_process_bytes (salt, salt_len, &alt_ctx); ++ ++ /* Finish the digest. */ ++ __sha256_finish_ctx (&alt_ctx, temp_result); ++ ++ /* Create byte sequence S. */ ++ cp = s_bytes = alloca (salt_len); ++ for (cnt = salt_len; cnt >= 32; cnt -= 32) ++ cp = mempcpy (cp, temp_result, 32); ++ memcpy (cp, temp_result, cnt); ++ ++ /* Repeatedly run the collected hash value through SHA256 to burn ++ CPU cycles. */ ++ for (cnt = 0; cnt < rounds; ++cnt) ++ { ++ /* New context. */ ++ __sha256_init_ctx (&ctx); ++ ++ /* Add key or last result. */ ++ if ((cnt & 1) != 0) ++ __sha256_process_bytes (p_bytes, key_len, &ctx); ++ else ++ __sha256_process_bytes (alt_result, 32, &ctx); ++ ++ /* Add salt for numbers not divisible by 3. */ ++ if (cnt % 3 != 0) ++ __sha256_process_bytes (s_bytes, salt_len, &ctx); ++ ++ /* Add key for numbers not divisible by 7. */ ++ if (cnt % 7 != 0) ++ __sha256_process_bytes (p_bytes, key_len, &ctx); ++ ++ /* Add key or last result. */ ++ if ((cnt & 1) != 0) ++ __sha256_process_bytes (alt_result, 32, &ctx); ++ else ++ __sha256_process_bytes (p_bytes, key_len, &ctx); ++ ++ /* Create intermediate result. */ ++ __sha256_finish_ctx (&ctx, alt_result); ++ } ++ ++ /* Now we can construct the result string. It consists of three ++ parts. */ ++ cp = stpncpy (buffer, sha256_salt_prefix, MAX (0, buflen)); ++ buflen -= sizeof (sha256_salt_prefix) - 1; ++ ++ if (rounds_custom) ++ { ++ int n = snprintf (cp, MAX (0, buflen), "%s%zu$", ++ sha256_rounds_prefix, rounds); ++ cp += n; ++ buflen -= n; ++ } ++ ++ cp = stpncpy (cp, salt, MIN ((size_t) MAX (0, buflen), salt_len)); ++ buflen -= MIN ((size_t) MAX (0, buflen), salt_len); ++ ++ if (buflen > 0) ++ { ++ *cp++ = '$'; ++ --buflen; ++ } ++ ++ B64_FROM_24BIT (alt_result[0], alt_result[10], alt_result[20], 4); ++ B64_FROM_24BIT (alt_result[21], alt_result[1], alt_result[11], 4); ++ B64_FROM_24BIT (alt_result[12], alt_result[22], alt_result[2], 4); ++ B64_FROM_24BIT (alt_result[3], alt_result[13], alt_result[23], 4); ++ B64_FROM_24BIT (alt_result[24], alt_result[4], alt_result[14], 4); ++ B64_FROM_24BIT (alt_result[15], alt_result[25], alt_result[5], 4); ++ B64_FROM_24BIT (alt_result[6], alt_result[16], alt_result[26], 4); ++ B64_FROM_24BIT (alt_result[27], alt_result[7], alt_result[17], 4); ++ B64_FROM_24BIT (alt_result[18], alt_result[28], alt_result[8], 4); ++ B64_FROM_24BIT (alt_result[9], alt_result[19], alt_result[29], 4); ++ B64_FROM_24BIT (0, alt_result[31], alt_result[30], 3); ++ if (buflen <= 0) ++ { ++ __set_errno (ERANGE); ++ buffer = NULL; ++ } ++ else ++ *cp = '\0'; /* Terminate the string. */ ++ ++ /* Clear the buffer for the intermediate result so that people ++ attaching to processes or reading core dumps cannot get any ++ information. We do it in this way to clear correct_words[] ++ inside the SHA256 implementation as well. */ ++ __sha256_init_ctx (&ctx); ++ __sha256_finish_ctx (&ctx, alt_result); ++ memset (&ctx, '\0', sizeof (ctx)); ++ memset (&alt_ctx, '\0', sizeof (alt_ctx)); ++ ++ memset (temp_result, '\0', sizeof (temp_result)); ++ memset (p_bytes, '\0', key_len); ++ memset (s_bytes, '\0', salt_len); ++ if (copied_key != NULL) ++ memset (copied_key, '\0', key_len); ++ if (copied_salt != NULL) ++ memset (copied_salt, '\0', salt_len); ++ ++ return buffer; ++} ++ ++static char *buffer; ++ ++/* This entry point is equivalent to the `crypt' function in Unix ++ libcs. */ ++char * ++__sha256_crypt (const unsigned char *key, const unsigned char *salt) ++{ ++ /* We don't want to have an arbitrary limit in the size of the ++ password. We can compute an upper bound for the size of the ++ result in advance and so we can prepare the buffer we pass to ++ `sha256_crypt_r'. */ ++ static int buflen; ++ int needed = (sizeof (sha256_salt_prefix) - 1 ++ + sizeof (sha256_rounds_prefix) + 9 + 1 ++ + strlen (salt) + 1 + 43 + 1); ++ ++ if (buflen < needed) ++ { ++ char *new_buffer = (char *) realloc (buffer, needed); ++ if (new_buffer == NULL) ++ return NULL; ++ ++ buffer = new_buffer; ++ buflen = needed; ++ } ++ ++ return __sha256_crypt_r ((const char *) key, (const char *) salt, buffer, buflen); ++} +diff --git a/libcrypt/sha256.c b/libcrypt/sha256.c +new file mode 100644 +index 0000000..e652a67 +--- /dev/null ++++ b/libcrypt/sha256.c +@@ -0,0 +1,294 @@ ++/* Functions to compute SHA256 message digest of files or memory blocks. ++ according to the definition of SHA256 in FIPS 180-2. ++ Copyright (C) 2007 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, write to the Free ++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ++ 02111-1307 USA. */ ++ ++/* Written by Ulrich Drepper <drepper@redhat.com>, 2007. */ ++ ++#ifdef HAVE_CONFIG_H ++# include <config.h> ++#endif ++ ++#include <endian.h> ++#include <stdlib.h> ++#include <string.h> ++#include <sys/types.h> ++ ++#include "sha256.h" ++ ++#if __BYTE_ORDER == __LITTLE_ENDIAN ++# ifdef _LIBC ++# include <byteswap.h> ++# define SWAP(n) bswap_32 (n) ++# else ++# define SWAP(n) \ ++ (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24)) ++# endif ++#else ++# define SWAP(n) (n) ++#endif ++ ++ ++/* This array contains the bytes used to pad the buffer to the next ++ 64-byte boundary. (FIPS 180-2:5.1.1) */ ++static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ... */ }; ++ ++ ++/* Constants for SHA256 from FIPS 180-2:4.2.2. */ ++static const uint32_t K[64] = ++ { ++ 0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, ++ 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5, ++ 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, ++ 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, ++ 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, ++ 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da, ++ 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, ++ 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967, ++ 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, ++ 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, ++ 0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, ++ 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070, ++ 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, ++ 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3, ++ 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, ++ 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2 ++ }; ++ ++ ++/* Process LEN bytes of BUFFER, accumulating context into CTX. ++ It is assumed that LEN % 64 == 0. */ ++static void ++sha256_process_block (const void *buffer, size_t len, struct sha256_ctx *ctx) ++{ ++ const uint32_t *words = buffer; ++ size_t nwords = len / sizeof (uint32_t); ++ uint32_t a = ctx->H[0]; ++ uint32_t b = ctx->H[1]; ++ uint32_t c = ctx->H[2]; ++ uint32_t d = ctx->H[3]; ++ uint32_t e = ctx->H[4]; ++ uint32_t f = ctx->H[5]; ++ uint32_t g = ctx->H[6]; ++ uint32_t h = ctx->H[7]; ++ ++ /* First increment the byte count. FIPS 180-2 specifies the possible ++ length of the file up to 2^64 bits. Here we only compute the ++ number of bytes. Do a double word increment. */ ++ ctx->total[0] += len; ++ if (ctx->total[0] < len) ++ ++ctx->total[1]; ++ ++ /* Process all bytes in the buffer with 64 bytes in each round of ++ the loop. */ ++ while (nwords > 0) ++ { ++ uint32_t W[64]; ++ uint32_t a_save = a; ++ uint32_t b_save = b; ++ uint32_t c_save = c; ++ uint32_t d_save = d; ++ uint32_t e_save = e; ++ uint32_t f_save = f; ++ uint32_t g_save = g; ++ uint32_t h_save = h; ++ ++ /* Operators defined in FIPS 180-2:4.1.2. */ ++#define Ch(x, y, z) ((x & y) ^ (~x & z)) ++#define Maj(x, y, z) ((x & y) ^ (x & z) ^ (y & z)) ++#define S0(x) (CYCLIC (x, 2) ^ CYCLIC (x, 13) ^ CYCLIC (x, 22)) ++#define S1(x) (CYCLIC (x, 6) ^ CYCLIC (x, 11) ^ CYCLIC (x, 25)) ++#define R0(x) (CYCLIC (x, 7) ^ CYCLIC (x, 18) ^ (x >> 3)) ++#define R1(x) (CYCLIC (x, 17) ^ CYCLIC (x, 19) ^ (x >> 10)) ++ ++ /* It is unfortunate that C does not provide an operator for ++ cyclic rotation. Hope the C compiler is smart enough. */ ++#define CYCLIC(w, s) ((w >> s) | (w << (32 - s))) ++ ++ /* Compute the message schedule according to FIPS 180-2:6.2.2 step 2. */ ++ for (unsigned int t = 0; t < 16; ++t) ++ { ++ W[t] = SWAP (*words); ++ ++words; ++ } ++ for (unsigned int t = 16; t < 64; ++t) ++ W[t] = R1 (W[t - 2]) + W[t - 7] + R0 (W[t - 15]) + W[t - 16]; ++ ++ /* The actual computation according to FIPS 180-2:6.2.2 step 3. */ ++ for (unsigned int t = 0; t < 64; ++t) ++ { ++ uint32_t T1 = h + S1 (e) + Ch (e, f, g) + K[t] + W[t]; ++ uint32_t T2 = S0 (a) + Maj (a, b, c); ++ h = g; ++ g = f; ++ f = e; ++ e = d + T1; ++ d = c; ++ c = b; ++ b = a; ++ a = T1 + T2; ++ } ++ ++ /* Add the starting values of the context according to FIPS 180-2:6.2.2 ++ step 4. */ ++ a += a_save; ++ b += b_save; ++ c += c_save; ++ d += d_save; ++ e += e_save; ++ f += f_save; ++ g += g_save; ++ h += h_save; ++ ++ /* Prepare for the next round. */ ++ nwords -= 16; ++ } ++ ++ /* Put checksum in context given as argument. */ ++ ctx->H[0] = a; ++ ctx->H[1] = b; ++ ctx->H[2] = c; ++ ctx->H[3] = d; ++ ctx->H[4] = e; ++ ctx->H[5] = f; ++ ctx->H[6] = g; ++ ctx->H[7] = h; ++} ++ ++ ++/* Initialize structure containing state of computation. ++ (FIPS 180-2:5.3.2) */ ++void ++__sha256_init_ctx (struct sha256_ctx *ctx) ++{ ++ ctx->H[0] = 0x6a09e667; ++ ctx->H[1] = 0xbb67ae85; ++ ctx->H[2] = 0x3c6ef372; ++ ctx->H[3] = 0xa54ff53a; ++ ctx->H[4] = 0x510e527f; ++ ctx->H[5] = 0x9b05688c; ++ ctx->H[6] = 0x1f83d9ab; ++ ctx->H[7] = 0x5be0cd19; ++ ++ ctx->total[0] = ctx->total[1] = 0; ++ ctx->buflen = 0; ++} ++ ++ ++/* Process the remaining bytes in the internal buffer and the usual ++ prolog according to the standard and write the result to RESBUF. ++ ++ IMPORTANT: On some systems it is required that RESBUF is correctly ++ aligned for a 32 bits value. */ ++void * ++__sha256_finish_ctx (struct sha256_ctx *ctx, void *resbuf) ++{ ++ /* Take yet unprocessed bytes into account. */ ++ uint32_t bytes = ctx->buflen; ++ size_t pad; ++ ++ /* Now count remaining bytes. */ ++ ctx->total[0] += bytes; ++ if (ctx->total[0] < bytes) ++ ++ctx->total[1]; ++ ++ pad = bytes >= 56 ? 64 + 56 - bytes : 56 - bytes; ++ memcpy (&ctx->buffer[bytes], fillbuf, pad); ++ ++ /* Put the 64-bit file length in *bits* at the end of the buffer. */ ++ *(uint32_t *) &ctx->buffer[bytes + pad + 4] = SWAP (ctx->total[0] << 3); ++ *(uint32_t *) &ctx->buffer[bytes + pad] = SWAP ((ctx->total[1] << 3) | ++ (ctx->total[0] >> 29)); ++ ++ /* Process last bytes. */ ++ sha256_process_block (ctx->buffer, bytes + pad + 8, ctx); ++ ++ /* Put result from CTX in first 32 bytes following RESBUF. */ ++ for (unsigned int i = 0; i < 8; ++i) ++ ((uint32_t *) resbuf)[i] = SWAP (ctx->H[i]); ++ ++ return resbuf; ++} ++ ++ ++void ++__sha256_process_bytes (const void *buffer, size_t len, struct sha256_ctx *ctx) ++{ ++ /* When we already have some bits in our internal buffer concatenate ++ both inputs first. */ ++ if (ctx->buflen != 0) ++ { ++ size_t left_over = ctx->buflen; ++ size_t add = 128 - left_over > len ? len : 128 - left_over; ++ ++ memcpy (&ctx->buffer[left_over], buffer, add); ++ ctx->buflen += add; ++ ++ if (ctx->buflen > 64) ++ { ++ sha256_process_block (ctx->buffer, ctx->buflen & ~63, ctx); ++ ++ ctx->buflen &= 63; ++ /* The regions in the following copy operation cannot overlap. */ ++ memcpy (ctx->buffer, &ctx->buffer[(left_over + add) & ~63], ++ ctx->buflen); ++ } ++ ++ buffer = (const char *) buffer + add; ++ len -= add; ++ } ++ ++ /* Process available complete blocks. */ ++ if (len >= 64) ++ { ++#if __GNUC__ >= 2 ++# define UNALIGNED_P(p) (((uintptr_t) p) % __alignof__ (uint32_t) != 0) ++#else ++# define UNALIGNED_P(p) (((uintptr_t) p) % sizeof (uint32_t) != 0) ++#endif ++ if (UNALIGNED_P (buffer)) ++ while (len > 64) ++ { ++ sha256_process_block (memcpy (ctx->buffer, buffer, 64), 64, ctx); ++ buffer = (const char *) buffer + 64; ++ len -= 64; ++ } ++ else ++ { ++ sha256_process_block (buffer, len & ~63, ctx); ++ buffer = (const char *) buffer + (len & ~63); ++ len &= 63; ++ } ++ } ++ ++ /* Move remaining bytes into internal buffer. */ ++ if (len > 0) ++ { ++ size_t left_over = ctx->buflen; ++ ++ memcpy (&ctx->buffer[left_over], buffer, len); ++ left_over += len; ++ if (left_over >= 64) ++ { ++ sha256_process_block (ctx->buffer, 64, ctx); ++ left_over -= 64; ++ memcpy (ctx->buffer, &ctx->buffer[64], left_over); ++ } ++ ctx->buflen = left_over; ++ } ++} +diff --git a/libcrypt/sha256.h b/libcrypt/sha256.h +new file mode 100644 +index 0000000..291674f +--- /dev/null ++++ b/libcrypt/sha256.h +@@ -0,0 +1,58 @@ ++/* Declaration of functions and data types used for SHA256 sum computing ++ library functions. ++ Copyright (C) 2007 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, write to the Free ++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ++ 02111-1307 USA. */ ++ ++#ifndef _SHA256_H ++#define _SHA256_H 1 ++ ++#include <limits.h> ++#include <stdint.h> ++#include <stdio.h> ++ ++ ++/* Structure to save state of computation between the single steps. */ ++struct sha256_ctx ++{ ++ uint32_t H[8]; ++ ++ uint32_t total[2]; ++ uint32_t buflen; ++ char buffer[128] __attribute__ ((__aligned__ (__alignof__ (uint32_t)))); ++}; ++ ++/* Initialize structure containing state of computation. ++ (FIPS 180-2: 5.3.2) */ ++extern void __sha256_init_ctx (struct sha256_ctx *ctx) attribute_hidden; ++ ++/* Starting with the result of former calls of this function (or the ++ initialization function update the context for the next LEN bytes ++ starting at BUFFER. ++ It is NOT required that LEN is a multiple of 64. */ ++extern void __sha256_process_bytes (const void *buffer, size_t len, ++ struct sha256_ctx *ctx) attribute_hidden; ++ ++/* Process the remaining bytes in the buffer and put result from CTX ++ in first 32 bytes following RESBUF. ++ ++ IMPORTANT: On some systems it is required that RESBUF is correctly ++ aligned for a 32 bits value. */ ++extern void *__sha256_finish_ctx (struct sha256_ctx *ctx, void *resbuf) ++ attribute_hidden; ++ ++#endif /* sha256.h */ +-- +1.7.8 + diff --git a/main/libc0.9.32/uclibc-eventfd.patch b/main/libc0.9.32/0022-Add-eventfd-support.patch index 1525366c34..d42da01206 100644 --- a/main/libc0.9.32/uclibc-eventfd.patch +++ b/main/libc0.9.32/0022-Add-eventfd-support.patch @@ -1,28 +1,7 @@ -From: jc@eclis.ch -To: uclibc@uclibc.org -Subject: [PATCH 1/1] Add eventfd support. -Date: Mon, 24 Oct 2011 19:07:43 +0200 -Message-Id: <1319476064-32442-1-git-send-email-jc@eclis.ch> -X-Mailer: git-send-email 1.7.2.5 -X-BeenThere: uclibc@uclibc.org -X-Mailman-Version: 2.1.14 -Precedence: list -List-Id: "Discussion and development of uClibc \(the embedded C library\)" - <uclibc.uclibc.org> -List-Unsubscribe: <http://lists.busybox.net/mailman/options/uclibc>, - <mailto:uclibc-request@uclibc.org?subject=unsubscribe> -List-Archive: <http://lists.busybox.net/pipermail/uclibc> -List-Post: <mailto:uclibc@uclibc.org> -List-Help: <mailto:uclibc-request@uclibc.org?subject=help> -List-Subscribe: <http://lists.busybox.net/mailman/listinfo/uclibc>, - <mailto:uclibc-request@uclibc.org?subject=subscribe> -MIME-Version: 1.0 -Content-Type: text/plain; charset="us-ascii" -Content-Transfer-Encoding: 7bit -Errors-To: uclibc-bounces@uclibc.org -Sender: uclibc-bounces@uclibc.org - +From 000e9aca3ee3f07c934a154fd375c5f3c7f9cc80 Mon Sep 17 00:00:00 2001 From: Jean-Christian de Rivaz <jc@eclis.ch> +Date: Mon, 24 Oct 2011 19:07:43 +0200 +Subject: [PATCH] Add eventfd support. Hello, @@ -32,6 +11,8 @@ uClibc. Please review so it can be accepted to be merged. Jean-Christian Signed-off-by: Jean-Christian de Rivaz <jc@eclis.ch> +Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com> +(cherry picked from commit 9ed163dc0eaebe8734c35b356c406e9eb1c68d76) --- libc/sysdeps/linux/common/Makefile.in | 3 +- libc/sysdeps/linux/common/eventfd.c | 18 +++++++++++ @@ -133,9 +114,5 @@ index 0000000..311f803 + +#endif /* sys/eventfd.h */ -- -1.7.2.5 +1.7.8 -_______________________________________________ -uClibc mailing list -uClibc@uclibc.org -http://lists.busybox.net/mailman/listinfo/uclibc diff --git a/main/libc0.9.32/0023-crypt-build-fix.-define-ARRAY_SIZE-macro.patch b/main/libc0.9.32/0023-crypt-build-fix.-define-ARRAY_SIZE-macro.patch new file mode 100644 index 0000000000..623f93a6b1 --- /dev/null +++ b/main/libc0.9.32/0023-crypt-build-fix.-define-ARRAY_SIZE-macro.patch @@ -0,0 +1,26 @@ +From b7300840e0285239351e33fa613898fbb079efd7 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Fri, 23 Dec 2011 16:24:52 +0100 +Subject: [PATCH] crypt: build fix. define ARRAY_SIZE macro + +Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> +--- + libcrypt/crypt.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/libcrypt/crypt.c b/libcrypt/crypt.c +index 188a6a0..19f14d9 100644 +--- a/libcrypt/crypt.c ++++ b/libcrypt/crypt.c +@@ -12,6 +12,8 @@ + #include <errno.h> + #include "libcrypt.h" + ++#define ARRAY_SIZE(v) (sizeof(v) / sizeof((v)[0])) ++ + typedef char *(*crypt_impl_f)(const unsigned char *pw, const unsigned char *salt); + + static const struct { +-- +1.7.8 + diff --git a/main/libc0.9.32/APKBUILD b/main/libc0.9.32/APKBUILD index 019712353b..6c6185ec70 100644 --- a/main/libc0.9.32/APKBUILD +++ b/main/libc0.9.32/APKBUILD @@ -4,7 +4,7 @@ pkgname=libc$_abiver _gitver= pkgver=0.9.32 _ver=${pkgver/_/-} -pkgrel=14 +pkgrel=15 pkgdesc="C library for developing embedded Linux systems" url=http://uclibc.org license="LGPL-2" @@ -19,31 +19,41 @@ triggers="uclibc-utils.trigger=/lib:/usr/lib" _snapurl="http://git.uclibc.org/uClibc/snapshot/master.tar.bz2" _snapfile="$pkgname-$pkgver.tar.bz2" + +# patches are tracked in http://git.alpinelinux.org/cgit/uClibc-alpine/ +# branch 0.9.32-alpine + source="http://uclibc.org/downloads/uClibc-${_ver}.tar.bz2 - compat-stack-guard.patch - uclibc-resolv-cname-fix.diff - uclibc-resolv-fix-memory-leak.patch - 0001-resolv-fix-resolver-to-return-TRY_AGAIN-on-timeout.patch - 0001-libm-x86_64-implement-some-fenv-functions.patch - 0001-ldso-limited-support-for-ORIGIN-in-rpath.patch - 0002-stdlib-fix-arc4random-return-type-to-u_int32_t.patch - 0003-ldso-support-RTLD_NOLOAD.patch - 0001-libdl-rudimentary-locking-for-dlopen-dlsym-dlclose.patch - 0001-malloc-standard-synchronize-on-fork.patch - 0001-time-fix-parsing-of-tzdata-files-where-off_t-is-64-b.patch - 0001-getaddrinfo-allow-numeric-service-without-any-hints.patch - 0001-libc-x86-fix-stack-unwinding-and-backtrace-informati.patch - libm-cabsf.patch - libm-cexp.patch - uclibc-ubacktrace-asneeded-fix.patch - uclibc-epoll_pwait-hack.patch + +0001-Compatible-stack-protector-for-non-Thread-Local-stor.patch +0002-resolv-res_query-for-CNAMEs.patch +0003-resolv-fix-memory-leak.patch +0004-resolv-fix-resolver-to-return-TRY_AGAIN-on-timeout.patch +0005-libm-x86_64-implement-some-fenv-functions.patch +0006-ldso-limited-support-for-ORIGIN-in-rpath.patch +0007-stdlib-fix-arc4random-return-type-to-u_int32_t.patch +0008-ldso-support-RTLD_NOLOAD.patch +0009-libdl-rudimentary-locking-for-dlopen-dlsym-dlclose.patch +0010-malloc-standard-synchronize-on-fork.patch +0011-time-fix-parsing-of-tzdata-files-where-off_t-is-64-b.patch +0012-getaddrinfo-allow-numeric-service-without-any-hints.patch +0013-libc-x86-fix-stack-unwinding-and-backtrace-informati.patch +0014-libm-add-cabsf-and-cabsl-functions.patch +0015-libm-implement-generic-cexp-cexpf-and-cexpl.patch +0016-libubacktrace-use-.so.-ABI_VERSION.patch +0017-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch +0018-libcrypt-do-not-cast-away-const-of-key-salt.patch +0019-libcrypt-make-crypt-itself-more-modular.patch +0020-libcrypt-add-support-for-SHA512-CRYPT-password-hashi.patch +0021-libcrypt-add-support-for-SHA256-CRYPT-password-hashi.patch +0022-Add-eventfd-support.patch +0023-crypt-build-fix.-define-ARRAY_SIZE-macro.patch + uclibcconfig.x86 uclibcconfig.x86_64 uclibcconfig.i486 uclibcconfig.arm uclibcconfig.powerpc - sha512-crypt.patch - uclibc-eventfd.patch uclibc-utils.trigger " @@ -132,28 +142,32 @@ libthread_db() { } md5sums="cfcb6c25d8ebe12817499d8749ee8ae1 uClibc-0.9.32.tar.bz2 -a9bfb77ea7dc5fb9abf4d4b19201c614 compat-stack-guard.patch -5d6e3e382b66f59cfd7242a4fe453f98 uclibc-resolv-cname-fix.diff -6bdb884bd00b053247e02b4024d33b39 uclibc-resolv-fix-memory-leak.patch -08f31006426a0fca561f262f36bcfb01 0001-resolv-fix-resolver-to-return-TRY_AGAIN-on-timeout.patch -68913d6f096fd647e8bdb7ef182c05a4 0001-libm-x86_64-implement-some-fenv-functions.patch -bc164e262c5feab55c800780704fa71c 0001-ldso-limited-support-for-ORIGIN-in-rpath.patch -b4fb68ad3d0e8331b1b40c30eb21dfdc 0002-stdlib-fix-arc4random-return-type-to-u_int32_t.patch -6147efd2eee5af5e734896823c2d1a3d 0003-ldso-support-RTLD_NOLOAD.patch -3e151ae3d3613dff9296d166aca3a800 0001-libdl-rudimentary-locking-for-dlopen-dlsym-dlclose.patch -30f27fe51fdc4d121166ad2af18dfb8d 0001-malloc-standard-synchronize-on-fork.patch -2548d9f470c9a5b2c117ec3d6f35c105 0001-time-fix-parsing-of-tzdata-files-where-off_t-is-64-b.patch -9e1ffc8dae55f4489c770f284734804f 0001-getaddrinfo-allow-numeric-service-without-any-hints.patch -e814d39ab0adab58d69396ac0b9acdea 0001-libc-x86-fix-stack-unwinding-and-backtrace-informati.patch -40e9c7f017cc81ee5b19ead000b9b6b7 libm-cabsf.patch -42416385763f7cd50775ed9bfaf2d59e libm-cexp.patch -7c47e9cb284b0da8df6ed2096b2c9c66 uclibc-ubacktrace-asneeded-fix.patch -0ed588014227935fbb83b207282f3c15 uclibc-epoll_pwait-hack.patch +11c206cd4be86514dd9abd811429ad06 0001-Compatible-stack-protector-for-non-Thread-Local-stor.patch +b905f5f0f27348cc91019275dcff51cb 0002-resolv-res_query-for-CNAMEs.patch +208f6ea0a97f2940319456d32549bfc5 0003-resolv-fix-memory-leak.patch +0f082e4b209bb83feb57a4a7dd8c2eb6 0004-resolv-fix-resolver-to-return-TRY_AGAIN-on-timeout.patch +8573d00e91395779c50af23c6aeb6fc5 0005-libm-x86_64-implement-some-fenv-functions.patch +31da620ecb3894fa6d76ef624cd264bb 0006-ldso-limited-support-for-ORIGIN-in-rpath.patch +afafe88bca1ffc1d4eb49de813c39c5b 0007-stdlib-fix-arc4random-return-type-to-u_int32_t.patch +779dbc9f04ad0c005ec4ea6b6ffff8ff 0008-ldso-support-RTLD_NOLOAD.patch +f0fc6dbeb1467812085b60a49654a955 0009-libdl-rudimentary-locking-for-dlopen-dlsym-dlclose.patch +a1c5871c3b799cce8d1dfcf8ca0f3743 0010-malloc-standard-synchronize-on-fork.patch +b2c09cdfc3116c6236dbe96697241a59 0011-time-fix-parsing-of-tzdata-files-where-off_t-is-64-b.patch +ddd3073f1a2696c1a9b40bfa81bfa5bf 0012-getaddrinfo-allow-numeric-service-without-any-hints.patch +78cdafafc99007da8cbdf8d2f841ea47 0013-libc-x86-fix-stack-unwinding-and-backtrace-informati.patch +63af22efb20d9dfd3cb10bc9900f1615 0014-libm-add-cabsf-and-cabsl-functions.patch +7158d0ae15ca742cc1577b47735751df 0015-libm-implement-generic-cexp-cexpf-and-cexpl.patch +ecca599d286ff18afa7f64ab614e88ff 0016-libubacktrace-use-.so.-ABI_VERSION.patch +430b286df16f21cc4b46b6f1894cd834 0017-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch +57562e6688dcbcf708d574de81debf7e 0018-libcrypt-do-not-cast-away-const-of-key-salt.patch +028d8279da6c44457a8a8de4e1e6de36 0019-libcrypt-make-crypt-itself-more-modular.patch +ebf59b00af0a0c44a5992403255a6582 0020-libcrypt-add-support-for-SHA512-CRYPT-password-hashi.patch +2744db828eb9a0e8a1e01b2ca9d083a5 0021-libcrypt-add-support-for-SHA256-CRYPT-password-hashi.patch +e5bb17073c83dcdb972bf22657ca4cc7 0022-Add-eventfd-support.patch +efafd82e78291171392d4706b80a2fb3 0023-crypt-build-fix.-define-ARRAY_SIZE-macro.patch 0e40006f3c284a27313e0d54f91452e2 uclibcconfig.x86 f6aee6bcbc43dcbfcaaba7be244ad368 uclibcconfig.x86_64 0e40006f3c284a27313e0d54f91452e2 uclibcconfig.i486 8ae78c9ab4bd7b1223c29c335c76a8c5 uclibcconfig.arm 70fcde1955810a2369c023b293bae5c5 uclibcconfig.powerpc -436bf7bea962b477bb93119514c90c9b sha512-crypt.patch -26dd7611fda4d29f3dc4a7cf24916931 uclibc-eventfd.patch f3be4f2bc54d7561d252937e10abf0d2 uclibc-utils.trigger" diff --git a/main/libc0.9.32/sha512-crypt.patch b/main/libc0.9.32/sha512-crypt.patch deleted file mode 100644 index 6a4b1001b4..0000000000 --- a/main/libc0.9.32/sha512-crypt.patch +++ /dev/null @@ -1,1777 +0,0 @@ -From 71ad18ce94b15cd000a3e90a0a30ee81ac1b443a Mon Sep 17 00:00:00 2001 -From: William Pitcock <nenolod@dereferenced.org> -Date: Wed, 16 Nov 2011 05:27:48 -0600 -Subject: [PATCH 1/2] libcrypt: make crypt() more modular -To: uclibc@uclibc.org - -By using a function table, we can more cleanly support new crypt -implementations, such as SHA256 ($5$) and SHA512 ($6$). - -Signed-off-by: William Pitcock <nenolod@dereferenced.org> ---- - libcrypt/crypt.c | 34 ++++++++++++++++++++++++++++------ - 1 files changed, 28 insertions(+), 6 deletions(-) - -diff --git a/libcrypt/crypt.c b/libcrypt/crypt.c -index 8b361d3..28cbc70 100644 ---- a/libcrypt/crypt.c -+++ b/libcrypt/crypt.c -@@ -8,14 +8,36 @@ - #define __FORCE_GLIBC - #include <crypt.h> - #include <unistd.h> -+#include <string.h> -+#include <syscall.h> - #include "libcrypt.h" - -+#define ARRAY_SIZE(v) (sizeof(v) / sizeof((v)[0])) -+ -+typedef char *(*crypt_impl_f)(const unsigned char *pw, const unsigned char *salt); -+ -+static const struct { -+ const char *salt_pfx; -+ const crypt_impl_f crypt_impl; -+} crypt_impl_tab[] = { -+ { "$1$", __md5_crypt }, -+ { NULL, __des_crypt }, -+}; -+ - char *crypt(const char *key, const char *salt) - { -- /* First, check if we are supposed to be using the MD5 replacement -- * instead of DES... */ -- if (salt[0]=='$' && salt[1]=='1' && salt[2]=='$') -- return __md5_crypt((unsigned char*)key, (unsigned char*)salt); -- else -- return __des_crypt((unsigned char*)key, (unsigned char*)salt); -+ unsigned int i; -+ -+ for (i = 0; i < ARRAY_SIZE(crypt_impl_tab); i++) -+ { -+ if (crypt_impl_tab[i].salt_pfx && -+ strncmp(crypt_impl_tab[i].salt_pfx, salt, strlen(crypt_impl_tab[i].salt_pfx))) -+ continue; -+ -+ return crypt_impl_tab[i].crypt_impl((unsigned char *) key, (unsigned char *) salt); -+ } -+ -+ /* this should never happen, but just incase... */ -+ __set_errno(ENOSYS); -+ return NULL; - } --- -1.7.7.3 - -From 3c0ca4dcbb38987bda7981f6c876a291d3051f12 Mon Sep 17 00:00:00 2001 -From: William Pitcock <nenolod@dereferenced.org> -Date: Wed, 16 Nov 2011 05:53:34 -0600 -Subject: [PATCH 2/2] libcrypt: add support for SHA512-crypt. -To: uclibc@uclibc.org - -This is based on Ulrich Drepper's implementation in GLIBC, but hacked up to work -in uClibc. A previous version of this patch was rejected, this is the cleaned up -version. - -Signed-off-by: William Pitcock <nenolod@dereferenced.org> ---- - extra/Configs/Config.in | 6 + - libcrypt/Makefile.in | 1 + - libcrypt/crypt.c | 3 + - libcrypt/libcrypt.h | 3 + - libcrypt/sha512-crypt.c | 339 +++++++++++++++++++++++++++++++++++++++++++++++ - libcrypt/sha512.c | 326 +++++++++++++++++++++++++++++++++++++++++++++ - libcrypt/sha512.h | 58 ++++++++ - 7 files changed, 736 insertions(+), 0 deletions(-) - create mode 100644 libcrypt/sha512-crypt.c - create mode 100644 libcrypt/sha512.c - create mode 100644 libcrypt/sha512.h - -diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in -index 0f0ccfe..1ec041d 100644 ---- a/extra/Configs/Config.in -+++ b/extra/Configs/Config.in -@@ -1174,6 +1174,12 @@ config UCLIBC_HAS_CRYPT_IMPL - help - libcrypt contains crypt(), setkey() and encrypt() - -+config UCLIBC_HAS_SHA512_CRYPT_IMPL -+ bool "libcrypt SHA512 support" -+ default y -+ help -+ Say N here if you do not need SHA512 crypt support. -+ - config UCLIBC_HAS_CRYPT_STUB - bool "libcrypt stubs" - default y -diff --git a/libcrypt/Makefile.in b/libcrypt/Makefile.in -index 1d1fb55..2fceaed 100644 ---- a/libcrypt/Makefile.in -+++ b/libcrypt/Makefile.in -@@ -21,6 +21,7 @@ libcrypt_OUT := $(top_builddir)libcrypt - - libcrypt_SRC-y := - libcrypt_SRC-$(UCLIBC_HAS_CRYPT_IMPL) += crypt.c des.c md5.c -+libcrypt_SRC-$(UCLIBC_HAS_SHA512_CRYPT_IMPL) += sha512.c sha512-crypt.c - libcrypt_SRC-$(UCLIBC_HAS_CRYPT_STUB) += crypt_stub.c - - libcrypt_SRC := $(addprefix $(libcrypt_DIR)/,$(libcrypt_SRC-y)) -diff --git a/libcrypt/crypt.c b/libcrypt/crypt.c -index 28cbc70..2bb2c33 100644 ---- a/libcrypt/crypt.c -+++ b/libcrypt/crypt.c -@@ -21,6 +21,9 @@ static const struct { - const crypt_impl_f crypt_impl; - } crypt_impl_tab[] = { - { "$1$", __md5_crypt }, -+#ifdef __UCLIBC_HAS_SHA512_CRYPT_IMPL__ -+ { "$6$", __sha512_crypt }, -+#endif - { NULL, __des_crypt }, - }; - -diff --git a/libcrypt/libcrypt.h b/libcrypt/libcrypt.h -index 1186620..fcad6ae 100644 ---- a/libcrypt/libcrypt.h -+++ b/libcrypt/libcrypt.h -@@ -9,8 +9,11 @@ - #define __LIBCRYPT_H__ - - extern char *__md5_crypt(const unsigned char *pw, const unsigned char *salt) attribute_hidden; -+extern char *__sha512_crypt(const unsigned char *pw, const unsigned char *salt) attribute_hidden; - extern char *__des_crypt(const unsigned char *pw, const unsigned char *salt) attribute_hidden; - -+extern char *__sha512_crypt_r (const char *key, const char *salt, char *buffer, int buflen) attribute_hidden; -+ - /* shut up gcc-4.x signed warnings */ - #define strcpy(dst,src) strcpy((char*)dst,(char*)src) - #define strlen(s) strlen((char*)s) -diff --git a/libcrypt/sha512-crypt.c b/libcrypt/sha512-crypt.c -new file mode 100644 -index 0000000..dece925 ---- /dev/null -+++ b/libcrypt/sha512-crypt.c -@@ -0,0 +1,339 @@ -+/* One way encryption based on SHA512 sum. -+ Copyright (C) 2007, 2009 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ Contributed by Ulrich Drepper <drepper@redhat.com>, 2007. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, write to the Free -+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -+ 02111-1307 USA. */ -+ -+#include <assert.h> -+#include <errno.h> -+#include <stdbool.h> -+#include <stdlib.h> -+#include <string.h> -+#include <sys/param.h> -+ -+#include "sha512.h" -+#include "libcrypt.h" -+ -+/* Define our magic string to mark salt for SHA512 "encryption" -+ replacement. */ -+static const char sha512_salt_prefix[] = "$6$"; -+ -+/* Prefix for optional rounds specification. */ -+static const char sha512_rounds_prefix[] = "rounds="; -+ -+/* Maximum salt string length. */ -+#define SALT_LEN_MAX 16 -+/* Default number of rounds if not explicitly specified. */ -+#define ROUNDS_DEFAULT 5000 -+/* Minimum number of rounds. */ -+#define ROUNDS_MIN 1000 -+/* Maximum number of rounds. */ -+#define ROUNDS_MAX 999999999 -+ -+/* Table with characters for base64 transformation. */ -+static const char b64t[64] = -+"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; -+ -+char * -+__sha512_crypt_r (const char *key, -+ const char *salt, -+ char *buffer, -+ int buflen) -+{ -+ unsigned char alt_result[64] -+ __attribute__ ((__aligned__ (__alignof__ (uint64_t)))); -+ unsigned char temp_result[64] -+ __attribute__ ((__aligned__ (__alignof__ (uint64_t)))); -+ size_t salt_len; -+ size_t key_len; -+ size_t cnt; -+ char *cp; -+ char *copied_key = NULL; -+ char *copied_salt = NULL; -+ char *p_bytes; -+ char *s_bytes; -+ /* Default number of rounds. */ -+ size_t rounds = ROUNDS_DEFAULT; -+ bool rounds_custom = false; -+ -+ /* Find beginning of salt string. The prefix should normally always -+ be present. Just in case it is not. */ -+ if (strncmp (sha512_salt_prefix, salt, sizeof (sha512_salt_prefix) - 1) == 0) -+ /* Skip salt prefix. */ -+ salt += sizeof (sha512_salt_prefix) - 1; -+ -+ if (strncmp (salt, sha512_rounds_prefix, sizeof (sha512_rounds_prefix) - 1) -+ == 0) -+ { -+ const char *num = salt + sizeof (sha512_rounds_prefix) - 1; -+ char *endp; -+ unsigned long int srounds = strtoul (num, &endp, 10); -+ if (*endp == '$') -+ { -+ salt = endp + 1; -+ rounds = MAX (ROUNDS_MIN, MIN (srounds, ROUNDS_MAX)); -+ rounds_custom = true; -+ } -+ } -+ -+ salt_len = MIN (strcspn (salt, "$"), SALT_LEN_MAX); -+ key_len = strlen (key); -+ -+ if ((key - (char *) 0) % __alignof__ (uint64_t) != 0) -+ { -+ char *tmp = (char *) alloca (key_len + __alignof__ (uint64_t)); -+ key = copied_key = -+ memcpy (tmp + __alignof__ (uint64_t) -+ - (tmp - (char *) 0) % __alignof__ (uint64_t), -+ key, key_len); -+ assert ((key - (char *) 0) % __alignof__ (uint64_t) == 0); -+ } -+ -+ if ((salt - (char *) 0) % __alignof__ (uint64_t) != 0) -+ { -+ char *tmp = (char *) alloca (salt_len + __alignof__ (uint64_t)); -+ salt = copied_salt = -+ memcpy (tmp + __alignof__ (uint64_t) -+ - (tmp - (char *) 0) % __alignof__ (uint64_t), -+ salt, salt_len); -+ assert ((salt - (char *) 0) % __alignof__ (uint64_t) == 0); -+ } -+ -+ struct sha512_ctx ctx; -+ struct sha512_ctx alt_ctx; -+ -+ /* Prepare for the real work. */ -+ __sha512_init_ctx (&ctx); -+ -+ /* Add the key string. */ -+ __sha512_process_bytes (key, key_len, &ctx); -+ -+ /* The last part is the salt string. This must be at most 16 -+ characters and it ends at the first `$' character. */ -+ __sha512_process_bytes (salt, salt_len, &ctx); -+ -+ -+ /* Compute alternate SHA512 sum with input KEY, SALT, and KEY. The -+ final result will be added to the first context. */ -+ __sha512_init_ctx (&alt_ctx); -+ -+ /* Add key. */ -+ __sha512_process_bytes (key, key_len, &alt_ctx); -+ -+ /* Add salt. */ -+ __sha512_process_bytes (salt, salt_len, &alt_ctx); -+ -+ /* Add key again. */ -+ __sha512_process_bytes (key, key_len, &alt_ctx); -+ -+ /* Now get result of this (64 bytes) and add it to the other -+ context. */ -+ __sha512_finish_ctx (&alt_ctx, alt_result); -+ -+ /* Add for any character in the key one byte of the alternate sum. */ -+ for (cnt = key_len; cnt > 64; cnt -= 64) -+ __sha512_process_bytes (alt_result, 64, &ctx); -+ -+ __sha512_process_bytes (alt_result, cnt, &ctx); -+ -+ /* Take the binary representation of the length of the key and for every -+ 1 add the alternate sum, for every 0 the key. */ -+ for (cnt = key_len; cnt > 0; cnt >>= 1) -+ if ((cnt & 1) != 0) -+ __sha512_process_bytes (alt_result, 64, &ctx); -+ else -+ __sha512_process_bytes (key, key_len, &ctx); -+ -+ /* Create intermediate result. */ -+ __sha512_finish_ctx (&ctx, alt_result); -+ -+ /* Start computation of P byte sequence. */ -+ __sha512_init_ctx (&alt_ctx); -+ -+ /* For every character in the password add the entire password. */ -+ for (cnt = 0; cnt < key_len; ++cnt) -+ __sha512_process_bytes (key, key_len, &alt_ctx); -+ -+ /* Finish the digest. */ -+ __sha512_finish_ctx (&alt_ctx, temp_result); -+ -+ /* Create byte sequence P. */ -+ cp = p_bytes = alloca (key_len); -+ for (cnt = key_len; cnt >= 64; cnt -= 64) -+ cp = mempcpy (cp, temp_result, 64); -+ memcpy (cp, temp_result, cnt); -+ -+ /* Start computation of S byte sequence. */ -+ __sha512_init_ctx (&alt_ctx); -+ -+ /* For every character in the password add the entire password. */ -+ for (cnt = 0; cnt < 16 + alt_result[0]; ++cnt) -+ __sha512_process_bytes (salt, salt_len, &alt_ctx); -+ -+ /* Finish the digest. */ -+ __sha512_finish_ctx (&alt_ctx, temp_result); -+ -+ /* Create byte sequence S. */ -+ cp = s_bytes = alloca (salt_len); -+ for (cnt = salt_len; cnt >= 64; cnt -= 64) -+ cp = mempcpy (cp, temp_result, 64); -+ memcpy (cp, temp_result, cnt); -+ -+ /* Repeatedly run the collected hash value through SHA512 to burn -+ CPU cycles. */ -+ for (cnt = 0; cnt < rounds; ++cnt) -+ { -+ /* New context. */ -+ __sha512_init_ctx (&ctx); -+ -+ /* Add key or last result. */ -+ if ((cnt & 1) != 0) -+ __sha512_process_bytes (p_bytes, key_len, &ctx); -+ else -+ __sha512_process_bytes (alt_result, 64, &ctx); -+ -+ /* Add salt for numbers not divisible by 3. */ -+ if (cnt % 3 != 0) -+ __sha512_process_bytes (s_bytes, salt_len, &ctx); -+ -+ /* Add key for numbers not divisible by 7. */ -+ if (cnt % 7 != 0) -+ __sha512_process_bytes (p_bytes, key_len, &ctx); -+ -+ /* Add key or last result. */ -+ if ((cnt & 1) != 0) -+ __sha512_process_bytes (alt_result, 64, &ctx); -+ else -+ __sha512_process_bytes (p_bytes, key_len, &ctx); -+ -+ /* Create intermediate result. */ -+ __sha512_finish_ctx (&ctx, alt_result); -+ } -+ -+ /* Now we can construct the result string. It consists of three -+ parts. */ -+ cp = stpncpy (buffer, sha512_salt_prefix, MAX (0, buflen)); -+ buflen -= sizeof (sha512_salt_prefix) - 1; -+ -+ if (rounds_custom) -+ { -+ int n = snprintf (cp, MAX (0, buflen), "%s%zu$", -+ sha512_rounds_prefix, rounds); -+ cp += n; -+ buflen -= n; -+ } -+ -+ cp = stpncpy (cp, salt, MIN ((size_t) MAX (0, buflen), salt_len)); -+ buflen -= MIN ((size_t) MAX (0, buflen), salt_len); -+ -+ if (buflen > 0) -+ { -+ *cp++ = '$'; -+ --buflen; -+ } -+ -+ void b64_from_24bit (unsigned int b2, unsigned int b1, unsigned int b0, -+ int n) -+ { -+ unsigned int w = (b2 << 16) | (b1 << 8) | b0; -+ while (n-- > 0 && buflen > 0) -+ { -+ *cp++ = b64t[w & 0x3f]; -+ --buflen; -+ w >>= 6; -+ } -+ } -+ -+ b64_from_24bit (alt_result[0], alt_result[21], alt_result[42], 4); -+ b64_from_24bit (alt_result[22], alt_result[43], alt_result[1], 4); -+ b64_from_24bit (alt_result[44], alt_result[2], alt_result[23], 4); -+ b64_from_24bit (alt_result[3], alt_result[24], alt_result[45], 4); -+ b64_from_24bit (alt_result[25], alt_result[46], alt_result[4], 4); -+ b64_from_24bit (alt_result[47], alt_result[5], alt_result[26], 4); -+ b64_from_24bit (alt_result[6], alt_result[27], alt_result[48], 4); -+ b64_from_24bit (alt_result[28], alt_result[49], alt_result[7], 4); -+ b64_from_24bit (alt_result[50], alt_result[8], alt_result[29], 4); -+ b64_from_24bit (alt_result[9], alt_result[30], alt_result[51], 4); -+ b64_from_24bit (alt_result[31], alt_result[52], alt_result[10], 4); -+ b64_from_24bit (alt_result[53], alt_result[11], alt_result[32], 4); -+ b64_from_24bit (alt_result[12], alt_result[33], alt_result[54], 4); -+ b64_from_24bit (alt_result[34], alt_result[55], alt_result[13], 4); -+ b64_from_24bit (alt_result[56], alt_result[14], alt_result[35], 4); -+ b64_from_24bit (alt_result[15], alt_result[36], alt_result[57], 4); -+ b64_from_24bit (alt_result[37], alt_result[58], alt_result[16], 4); -+ b64_from_24bit (alt_result[59], alt_result[17], alt_result[38], 4); -+ b64_from_24bit (alt_result[18], alt_result[39], alt_result[60], 4); -+ b64_from_24bit (alt_result[40], alt_result[61], alt_result[19], 4); -+ b64_from_24bit (alt_result[62], alt_result[20], alt_result[41], 4); -+ b64_from_24bit (0, 0, alt_result[63], 2); -+ -+ if (buflen <= 0) -+ { -+ __set_errno (ERANGE); -+ buffer = NULL; -+ } -+ else -+ *cp = '\0'; /* Terminate the string. */ -+ -+ /* Clear the buffer for the intermediate result so that people -+ attaching to processes or reading core dumps cannot get any -+ information. We do it in this way to clear correct_words[] -+ inside the SHA512 implementation as well. */ -+ __sha512_init_ctx (&ctx); -+ __sha512_finish_ctx (&ctx, alt_result); -+ memset (&ctx, '\0', sizeof (ctx)); -+ memset (&alt_ctx, '\0', sizeof (alt_ctx)); -+ -+ memset (temp_result, '\0', sizeof (temp_result)); -+ memset (p_bytes, '\0', key_len); -+ memset (s_bytes, '\0', salt_len); -+ if (copied_key != NULL) -+ memset (copied_key, '\0', key_len); -+ if (copied_salt != NULL) -+ memset (copied_salt, '\0', salt_len); -+ -+ return buffer; -+} -+ -+static char *buffer; -+ -+/* This entry point is equivalent to the `crypt' function in Unix -+ libcs. */ -+char * -+__sha512_crypt (const unsigned char *key, const unsigned char *salt) -+{ -+ /* We don't want to have an arbitrary limit in the size of the -+ password. We can compute an upper bound for the size of the -+ result in advance and so we can prepare the buffer we pass to -+ `sha512_crypt_r'. */ -+ static int buflen; -+ int needed = (sizeof (sha512_salt_prefix) - 1 -+ + sizeof (sha512_rounds_prefix) + 9 + 1 -+ + strlen (salt) + 1 + 86 + 1); -+ -+ if (buflen < needed) -+ { -+ char *new_buffer = (char *) realloc (buffer, needed); -+ if (new_buffer == NULL) -+ return NULL; -+ -+ buffer = new_buffer; -+ buflen = needed; -+ } -+ -+ return __sha512_crypt_r ((const char *) key, (const char *) salt, buffer, buflen); -+} -diff --git a/libcrypt/sha512.c b/libcrypt/sha512.c -new file mode 100644 -index 0000000..04e0a06 ---- /dev/null -+++ b/libcrypt/sha512.c -@@ -0,0 +1,326 @@ -+/* Functions to compute SHA512 message digest of files or memory blocks. -+ according to the definition of SHA512 in FIPS 180-2. -+ Copyright (C) 2007 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, write to the Free -+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -+ 02111-1307 USA. */ -+ -+/* Written by Ulrich Drepper <drepper@redhat.com>, 2007. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <endian.h> -+#include <stdlib.h> -+#include <string.h> -+#include <sys/types.h> -+ -+#include "sha512.h" -+ -+#if __BYTE_ORDER == __LITTLE_ENDIAN -+# ifdef _LIBC -+# include <byteswap.h> -+# define SWAP(n) bswap_64 (n) -+# else -+# define SWAP(n) \ -+ (((n) << 56) \ -+ | (((n) & 0xff00) << 40) \ -+ | (((n) & 0xff0000) << 24) \ -+ | (((n) & 0xff000000) << 8) \ -+ | (((n) >> 8) & 0xff000000) \ -+ | (((n) >> 24) & 0xff0000) \ -+ | (((n) >> 40) & 0xff00) \ -+ | ((n) >> 56)) -+# endif -+#else -+# define SWAP(n) (n) -+#endif -+ -+ -+/* This array contains the bytes used to pad the buffer to the next -+ 64-byte boundary. (FIPS 180-2:5.1.2) */ -+static const unsigned char fillbuf[128] = { 0x80, 0 /* , 0, 0, ... */ }; -+ -+ -+/* Constants for SHA512 from FIPS 180-2:4.2.3. */ -+static const uint64_t K[80] = -+ { -+ UINT64_C (0x428a2f98d728ae22), UINT64_C (0x7137449123ef65cd), -+ UINT64_C (0xb5c0fbcfec4d3b2f), UINT64_C (0xe9b5dba58189dbbc), -+ UINT64_C (0x3956c25bf348b538), UINT64_C (0x59f111f1b605d019), -+ UINT64_C (0x923f82a4af194f9b), UINT64_C (0xab1c5ed5da6d8118), -+ UINT64_C (0xd807aa98a3030242), UINT64_C (0x12835b0145706fbe), -+ UINT64_C (0x243185be4ee4b28c), UINT64_C (0x550c7dc3d5ffb4e2), -+ UINT64_C (0x72be5d74f27b896f), UINT64_C (0x80deb1fe3b1696b1), -+ UINT64_C (0x9bdc06a725c71235), UINT64_C (0xc19bf174cf692694), -+ UINT64_C (0xe49b69c19ef14ad2), UINT64_C (0xefbe4786384f25e3), -+ UINT64_C (0x0fc19dc68b8cd5b5), UINT64_C (0x240ca1cc77ac9c65), -+ UINT64_C (0x2de92c6f592b0275), UINT64_C (0x4a7484aa6ea6e483), -+ UINT64_C (0x5cb0a9dcbd41fbd4), UINT64_C (0x76f988da831153b5), -+ UINT64_C (0x983e5152ee66dfab), UINT64_C (0xa831c66d2db43210), -+ UINT64_C (0xb00327c898fb213f), UINT64_C (0xbf597fc7beef0ee4), -+ UINT64_C (0xc6e00bf33da88fc2), UINT64_C (0xd5a79147930aa725), -+ UINT64_C (0x06ca6351e003826f), UINT64_C (0x142929670a0e6e70), -+ UINT64_C (0x27b70a8546d22ffc), UINT64_C (0x2e1b21385c26c926), -+ UINT64_C (0x4d2c6dfc5ac42aed), UINT64_C (0x53380d139d95b3df), -+ UINT64_C (0x650a73548baf63de), UINT64_C (0x766a0abb3c77b2a8), -+ UINT64_C (0x81c2c92e47edaee6), UINT64_C (0x92722c851482353b), -+ UINT64_C (0xa2bfe8a14cf10364), UINT64_C (0xa81a664bbc423001), -+ UINT64_C (0xc24b8b70d0f89791), UINT64_C (0xc76c51a30654be30), -+ UINT64_C (0xd192e819d6ef5218), UINT64_C (0xd69906245565a910), -+ UINT64_C (0xf40e35855771202a), UINT64_C (0x106aa07032bbd1b8), -+ UINT64_C (0x19a4c116b8d2d0c8), UINT64_C (0x1e376c085141ab53), -+ UINT64_C (0x2748774cdf8eeb99), UINT64_C (0x34b0bcb5e19b48a8), -+ UINT64_C (0x391c0cb3c5c95a63), UINT64_C (0x4ed8aa4ae3418acb), -+ UINT64_C (0x5b9cca4f7763e373), UINT64_C (0x682e6ff3d6b2b8a3), -+ UINT64_C (0x748f82ee5defb2fc), UINT64_C (0x78a5636f43172f60), -+ UINT64_C (0x84c87814a1f0ab72), UINT64_C (0x8cc702081a6439ec), -+ UINT64_C (0x90befffa23631e28), UINT64_C (0xa4506cebde82bde9), -+ UINT64_C (0xbef9a3f7b2c67915), UINT64_C (0xc67178f2e372532b), -+ UINT64_C (0xca273eceea26619c), UINT64_C (0xd186b8c721c0c207), -+ UINT64_C (0xeada7dd6cde0eb1e), UINT64_C (0xf57d4f7fee6ed178), -+ UINT64_C (0x06f067aa72176fba), UINT64_C (0x0a637dc5a2c898a6), -+ UINT64_C (0x113f9804bef90dae), UINT64_C (0x1b710b35131c471b), -+ UINT64_C (0x28db77f523047d84), UINT64_C (0x32caab7b40c72493), -+ UINT64_C (0x3c9ebe0a15c9bebc), UINT64_C (0x431d67c49c100d4c), -+ UINT64_C (0x4cc5d4becb3e42b6), UINT64_C (0x597f299cfc657e2a), -+ UINT64_C (0x5fcb6fab3ad6faec), UINT64_C (0x6c44198c4a475817) -+ }; -+ -+ -+/* Process LEN bytes of BUFFER, accumulating context into CTX. -+ It is assumed that LEN % 128 == 0. */ -+static void -+sha512_process_block (const void *buffer, size_t len, struct sha512_ctx *ctx) -+{ -+ const uint64_t *words = buffer; -+ size_t nwords = len / sizeof (uint64_t); -+ uint64_t a = ctx->H[0]; -+ uint64_t b = ctx->H[1]; -+ uint64_t c = ctx->H[2]; -+ uint64_t d = ctx->H[3]; -+ uint64_t e = ctx->H[4]; -+ uint64_t f = ctx->H[5]; -+ uint64_t g = ctx->H[6]; -+ uint64_t h = ctx->H[7]; -+ -+ /* First increment the byte count. FIPS 180-2 specifies the possible -+ length of the file up to 2^128 bits. Here we only compute the -+ number of bytes. Do a double word increment. */ -+ ctx->total[0] += len; -+ if (ctx->total[0] < len) -+ ++ctx->total[1]; -+ -+ /* Process all bytes in the buffer with 128 bytes in each round of -+ the loop. */ -+ while (nwords > 0) -+ { -+ uint64_t W[80]; -+ uint64_t a_save = a; -+ uint64_t b_save = b; -+ uint64_t c_save = c; -+ uint64_t d_save = d; -+ uint64_t e_save = e; -+ uint64_t f_save = f; -+ uint64_t g_save = g; -+ uint64_t h_save = h; -+ -+ /* Operators defined in FIPS 180-2:4.1.2. */ -+#define Ch(x, y, z) ((x & y) ^ (~x & z)) -+#define Maj(x, y, z) ((x & y) ^ (x & z) ^ (y & z)) -+#define S0(x) (CYCLIC (x, 28) ^ CYCLIC (x, 34) ^ CYCLIC (x, 39)) -+#define S1(x) (CYCLIC (x, 14) ^ CYCLIC (x, 18) ^ CYCLIC (x, 41)) -+#define R0(x) (CYCLIC (x, 1) ^ CYCLIC (x, 8) ^ (x >> 7)) -+#define R1(x) (CYCLIC (x, 19) ^ CYCLIC (x, 61) ^ (x >> 6)) -+ -+ /* It is unfortunate that C does not provide an operator for -+ cyclic rotation. Hope the C compiler is smart enough. */ -+#define CYCLIC(w, s) ((w >> s) | (w << (64 - s))) -+ -+ /* Compute the message schedule according to FIPS 180-2:6.3.2 step 2. */ -+ for (unsigned int t = 0; t < 16; ++t) -+ { -+ W[t] = SWAP (*words); -+ ++words; -+ } -+ for (unsigned int t = 16; t < 80; ++t) -+ W[t] = R1 (W[t - 2]) + W[t - 7] + R0 (W[t - 15]) + W[t - 16]; -+ -+ /* The actual computation according to FIPS 180-2:6.3.2 step 3. */ -+ for (unsigned int t = 0; t < 80; ++t) -+ { -+ uint64_t T1 = h + S1 (e) + Ch (e, f, g) + K[t] + W[t]; -+ uint64_t T2 = S0 (a) + Maj (a, b, c); -+ h = g; -+ g = f; -+ f = e; -+ e = d + T1; -+ d = c; -+ c = b; -+ b = a; -+ a = T1 + T2; -+ } -+ -+ /* Add the starting values of the context according to FIPS 180-2:6.3.2 -+ step 4. */ -+ a += a_save; -+ b += b_save; -+ c += c_save; -+ d += d_save; -+ e += e_save; -+ f += f_save; -+ g += g_save; -+ h += h_save; -+ -+ /* Prepare for the next round. */ -+ nwords -= 16; -+ } -+ -+ /* Put checksum in context given as argument. */ -+ ctx->H[0] = a; -+ ctx->H[1] = b; -+ ctx->H[2] = c; -+ ctx->H[3] = d; -+ ctx->H[4] = e; -+ ctx->H[5] = f; -+ ctx->H[6] = g; -+ ctx->H[7] = h; -+} -+ -+ -+/* Initialize structure containing state of computation. -+ (FIPS 180-2:5.3.3) */ -+void -+__sha512_init_ctx (struct sha512_ctx *ctx) -+{ -+ ctx->H[0] = UINT64_C (0x6a09e667f3bcc908); -+ ctx->H[1] = UINT64_C (0xbb67ae8584caa73b); -+ ctx->H[2] = UINT64_C (0x3c6ef372fe94f82b); -+ ctx->H[3] = UINT64_C (0xa54ff53a5f1d36f1); -+ ctx->H[4] = UINT64_C (0x510e527fade682d1); -+ ctx->H[5] = UINT64_C (0x9b05688c2b3e6c1f); -+ ctx->H[6] = UINT64_C (0x1f83d9abfb41bd6b); -+ ctx->H[7] = UINT64_C (0x5be0cd19137e2179); -+ -+ ctx->total[0] = ctx->total[1] = 0; -+ ctx->buflen = 0; -+} -+ -+ -+/* Process the remaining bytes in the internal buffer and the usual -+ prolog according to the standard and write the result to RESBUF. -+ -+ IMPORTANT: On some systems it is required that RESBUF is correctly -+ aligned for a 32 bits value. */ -+void * -+__sha512_finish_ctx (struct sha512_ctx *ctx, void *resbuf) -+{ -+ /* Take yet unprocessed bytes into account. */ -+ uint64_t bytes = ctx->buflen; -+ size_t pad; -+ -+ /* Now count remaining bytes. */ -+ ctx->total[0] += bytes; -+ if (ctx->total[0] < bytes) -+ ++ctx->total[1]; -+ -+ pad = bytes >= 112 ? 128 + 112 - bytes : 112 - bytes; -+ memcpy (&ctx->buffer[bytes], fillbuf, pad); -+ -+ /* Put the 128-bit file length in *bits* at the end of the buffer. */ -+ *(uint64_t *) &ctx->buffer[bytes + pad + 8] = SWAP (ctx->total[0] << 3); -+ *(uint64_t *) &ctx->buffer[bytes + pad] = SWAP ((ctx->total[1] << 3) | -+ (ctx->total[0] >> 61)); -+ -+ /* Process last bytes. */ -+ sha512_process_block (ctx->buffer, bytes + pad + 16, ctx); -+ -+ /* Put result from CTX in first 64 bytes following RESBUF. */ -+ for (unsigned int i = 0; i < 8; ++i) -+ ((uint64_t *) resbuf)[i] = SWAP (ctx->H[i]); -+ -+ return resbuf; -+} -+ -+ -+void -+__sha512_process_bytes (const void *buffer, size_t len, struct sha512_ctx *ctx) -+{ -+ /* When we already have some bits in our internal buffer concatenate -+ both inputs first. */ -+ if (ctx->buflen != 0) -+ { -+ size_t left_over = ctx->buflen; -+ size_t add = 256 - left_over > len ? len : 256 - left_over; -+ -+ memcpy (&ctx->buffer[left_over], buffer, add); -+ ctx->buflen += add; -+ -+ if (ctx->buflen > 128) -+ { -+ sha512_process_block (ctx->buffer, ctx->buflen & ~127, ctx); -+ -+ ctx->buflen &= 127; -+ /* The regions in the following copy operation cannot overlap. */ -+ memcpy (ctx->buffer, &ctx->buffer[(left_over + add) & ~127], -+ ctx->buflen); -+ } -+ -+ buffer = (const char *) buffer + add; -+ len -= add; -+ } -+ -+ /* Process available complete blocks. */ -+ if (len >= 128) -+ { -+#if __GNUC__ >= 2 -+# define UNALIGNED_P(p) (((uintptr_t) p) % __alignof__ (uint64_t) != 0) -+#else -+# define UNALIGNED_P(p) (((uintptr_t) p) % sizeof (uint64_t) != 0) -+#endif -+ if (UNALIGNED_P (buffer)) -+ while (len > 128) -+ { -+ sha512_process_block (memcpy (ctx->buffer, buffer, 128), 128, -+ ctx); -+ buffer = (const char *) buffer + 128; -+ len -= 128; -+ } -+ else -+ { -+ sha512_process_block (buffer, len & ~127, ctx); -+ buffer = (const char *) buffer + (len & ~127); -+ len &= 127; -+ } -+ } -+ -+ /* Move remaining bytes into internal buffer. */ -+ if (len > 0) -+ { -+ size_t left_over = ctx->buflen; -+ -+ memcpy (&ctx->buffer[left_over], buffer, len); -+ left_over += len; -+ if (left_over >= 128) -+ { -+ sha512_process_block (ctx->buffer, 128, ctx); -+ left_over -= 128; -+ memcpy (ctx->buffer, &ctx->buffer[128], left_over); -+ } -+ ctx->buflen = left_over; -+ } -+} -diff --git a/libcrypt/sha512.h b/libcrypt/sha512.h -new file mode 100644 -index 0000000..5777827 ---- /dev/null -+++ b/libcrypt/sha512.h -@@ -0,0 +1,58 @@ -+/* Declaration of functions and data types used for SHA512 sum computing -+ library functions. -+ Copyright (C) 2007 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, write to the Free -+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -+ 02111-1307 USA. */ -+ -+#ifndef _SHA512_H -+#define _SHA512_H 1 -+ -+#include <limits.h> -+#include <stdint.h> -+#include <stdio.h> -+ -+ -+/* Structure to save state of computation between the single steps. */ -+struct sha512_ctx -+{ -+ uint64_t H[8]; -+ -+ uint64_t total[2]; -+ uint64_t buflen; -+ char buffer[256] __attribute__ ((__aligned__ (__alignof__ (uint64_t)))); -+}; -+ -+/* Initialize structure containing state of computation. -+ (FIPS 180-2: 5.3.3) */ -+extern void __sha512_init_ctx (struct sha512_ctx *ctx) attribute_hidden; -+ -+/* Starting with the result of former calls of this function (or the -+ initialization function update the context for the next LEN bytes -+ starting at BUFFER. -+ It is NOT required that LEN is a multiple of 128. */ -+extern void __sha512_process_bytes (const void *buffer, size_t len, -+ struct sha512_ctx *ctx) attribute_hidden; -+ -+/* Process the remaining bytes in the buffer and put result from CTX -+ in first 64 bytes following RESBUF. -+ -+ IMPORTANT: On some systems it is required that RESBUF is correctly -+ aligned for a 64 bits value. */ -+extern void *__sha512_finish_ctx (struct sha512_ctx *ctx, void *resbuf) -+ attribute_hidden; -+ -+#endif /* sha512.h */ --- -1.7.7.3 - -From aad4fe2d08d930f3a63a5e31ec315cbedb1aa965 Mon Sep 17 00:00:00 2001 -From: William Pitcock <nenolod@dereferenced.org> -Date: Wed, 16 Nov 2011 06:05:07 -0600 -Subject: [PATCH] libcrypt/sha512-crypt: convert nested function - b64_from_24bit() into a macro - -The glibc implementation of sha512-crypt used inline functions which should -really be converted into a macro because otherwise a trampoline is potentially -created. - -Signed-off-by: William Pitcock <nenolod@dereferenced.org> ---- - libcrypt/sha512-crypt.c | 68 +++++++++++++++++++++++----------------------- - 1 files changed, 34 insertions(+), 34 deletions(-) - -diff --git a/libcrypt/sha512-crypt.c b/libcrypt/sha512-crypt.c -index dece925..0321be0 100644 ---- a/libcrypt/sha512-crypt.c -+++ b/libcrypt/sha512-crypt.c -@@ -48,6 +48,18 @@ static const char sha512_rounds_prefix[] = "rounds="; - static const char b64t[64] = - "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; - -+#define B64_FROM_24BIT(b2, b1, b0, steps) \ -+ { \ -+ int n = (steps); \ -+ unsigned int w = ((b2) << 16) | ((b1) << 8) | (b0); \ -+ while (n-- > 0 && buflen > 0) \ -+ { \ -+ *cp++ = b64t[w & 0x3f]; \ -+ --buflen; \ -+ w >>= 6; \ -+ } \ -+ } -+ - char * - __sha512_crypt_r (const char *key, - const char *salt, -@@ -246,40 +258,28 @@ __sha512_crypt_r (const char *key, - --buflen; - } - -- void b64_from_24bit (unsigned int b2, unsigned int b1, unsigned int b0, -- int n) -- { -- unsigned int w = (b2 << 16) | (b1 << 8) | b0; -- while (n-- > 0 && buflen > 0) -- { -- *cp++ = b64t[w & 0x3f]; -- --buflen; -- w >>= 6; -- } -- } -- -- b64_from_24bit (alt_result[0], alt_result[21], alt_result[42], 4); -- b64_from_24bit (alt_result[22], alt_result[43], alt_result[1], 4); -- b64_from_24bit (alt_result[44], alt_result[2], alt_result[23], 4); -- b64_from_24bit (alt_result[3], alt_result[24], alt_result[45], 4); -- b64_from_24bit (alt_result[25], alt_result[46], alt_result[4], 4); -- b64_from_24bit (alt_result[47], alt_result[5], alt_result[26], 4); -- b64_from_24bit (alt_result[6], alt_result[27], alt_result[48], 4); -- b64_from_24bit (alt_result[28], alt_result[49], alt_result[7], 4); -- b64_from_24bit (alt_result[50], alt_result[8], alt_result[29], 4); -- b64_from_24bit (alt_result[9], alt_result[30], alt_result[51], 4); -- b64_from_24bit (alt_result[31], alt_result[52], alt_result[10], 4); -- b64_from_24bit (alt_result[53], alt_result[11], alt_result[32], 4); -- b64_from_24bit (alt_result[12], alt_result[33], alt_result[54], 4); -- b64_from_24bit (alt_result[34], alt_result[55], alt_result[13], 4); -- b64_from_24bit (alt_result[56], alt_result[14], alt_result[35], 4); -- b64_from_24bit (alt_result[15], alt_result[36], alt_result[57], 4); -- b64_from_24bit (alt_result[37], alt_result[58], alt_result[16], 4); -- b64_from_24bit (alt_result[59], alt_result[17], alt_result[38], 4); -- b64_from_24bit (alt_result[18], alt_result[39], alt_result[60], 4); -- b64_from_24bit (alt_result[40], alt_result[61], alt_result[19], 4); -- b64_from_24bit (alt_result[62], alt_result[20], alt_result[41], 4); -- b64_from_24bit (0, 0, alt_result[63], 2); -+ B64_FROM_24BIT (alt_result[0], alt_result[21], alt_result[42], 4); -+ B64_FROM_24BIT (alt_result[22], alt_result[43], alt_result[1], 4); -+ B64_FROM_24BIT (alt_result[44], alt_result[2], alt_result[23], 4); -+ B64_FROM_24BIT (alt_result[3], alt_result[24], alt_result[45], 4); -+ B64_FROM_24BIT (alt_result[25], alt_result[46], alt_result[4], 4); -+ B64_FROM_24BIT (alt_result[47], alt_result[5], alt_result[26], 4); -+ B64_FROM_24BIT (alt_result[6], alt_result[27], alt_result[48], 4); -+ B64_FROM_24BIT (alt_result[28], alt_result[49], alt_result[7], 4); -+ B64_FROM_24BIT (alt_result[50], alt_result[8], alt_result[29], 4); -+ B64_FROM_24BIT (alt_result[9], alt_result[30], alt_result[51], 4); -+ B64_FROM_24BIT (alt_result[31], alt_result[52], alt_result[10], 4); -+ B64_FROM_24BIT (alt_result[53], alt_result[11], alt_result[32], 4); -+ B64_FROM_24BIT (alt_result[12], alt_result[33], alt_result[54], 4); -+ B64_FROM_24BIT (alt_result[34], alt_result[55], alt_result[13], 4); -+ B64_FROM_24BIT (alt_result[56], alt_result[14], alt_result[35], 4); -+ B64_FROM_24BIT (alt_result[15], alt_result[36], alt_result[57], 4); -+ B64_FROM_24BIT (alt_result[37], alt_result[58], alt_result[16], 4); -+ B64_FROM_24BIT (alt_result[59], alt_result[17], alt_result[38], 4); -+ B64_FROM_24BIT (alt_result[18], alt_result[39], alt_result[60], 4); -+ B64_FROM_24BIT (alt_result[40], alt_result[61], alt_result[19], 4); -+ B64_FROM_24BIT (alt_result[62], alt_result[20], alt_result[41], 4); -+ B64_FROM_24BIT (0, 0, alt_result[63], 2); - - if (buflen <= 0) - { --- -1.7.7.3 - -From 9b463f10d2b395c80533fa44876f6a387fc69289 Mon Sep 17 00:00:00 2001 -From: William Pitcock <nenolod@dereferenced.org> -Date: Wed, 16 Nov 2011 06:22:36 -0600 -Subject: [PATCH] libcrypt: add SHA256 crypt support. -To: uclibc@uclibc.org - -This is based on Ulrich Drepper's SHA256 crypt implementation in GLIBC. -I decided to add support for this as an option as there have been a few other -SHA256 patches proposed recently. - -Signed-off-by: William Pitcock <nenolod@dereferenced.org> ---- - extra/Configs/Config.in | 6 + - libcrypt/Makefile.in | 1 + - libcrypt/crypt.c | 3 + - libcrypt/libcrypt.h | 2 + - libcrypt/sha256-crypt.c | 326 +++++++++++++++++++++++++++++++++++++++++++++++ - libcrypt/sha256.c | 294 ++++++++++++++++++++++++++++++++++++++++++ - libcrypt/sha256.h | 58 +++++++++ - 7 files changed, 690 insertions(+), 0 deletions(-) - create mode 100644 libcrypt/sha256-crypt.c - create mode 100644 libcrypt/sha256.c - create mode 100644 libcrypt/sha256.h - -diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in -index 1ec041d..56db0c4 100644 ---- a/extra/Configs/Config.in -+++ b/extra/Configs/Config.in -@@ -1174,6 +1174,12 @@ config UCLIBC_HAS_CRYPT_IMPL - help - libcrypt contains crypt(), setkey() and encrypt() - -+config UCLIBC_HAS_SHA256_CRYPT_IMPL -+ bool "libcrypt SHA256 support" -+ default y -+ help -+ Say N here if you do not need SHA256 crypt support. -+ - config UCLIBC_HAS_SHA512_CRYPT_IMPL - bool "libcrypt SHA512 support" - default y -diff --git a/libcrypt/Makefile.in b/libcrypt/Makefile.in -index 2fceaed..94753f4 100644 ---- a/libcrypt/Makefile.in -+++ b/libcrypt/Makefile.in -@@ -21,6 +21,7 @@ libcrypt_OUT := $(top_builddir)libcrypt - - libcrypt_SRC-y := - libcrypt_SRC-$(UCLIBC_HAS_CRYPT_IMPL) += crypt.c des.c md5.c -+libcrypt_SRC-$(UCLIBC_HAS_SHA256_CRYPT_IMPL) += sha256.c sha256-crypt.c - libcrypt_SRC-$(UCLIBC_HAS_SHA512_CRYPT_IMPL) += sha512.c sha512-crypt.c - libcrypt_SRC-$(UCLIBC_HAS_CRYPT_STUB) += crypt_stub.c - -diff --git a/libcrypt/crypt.c b/libcrypt/crypt.c -index 2bb2c33..15e3b29 100644 ---- a/libcrypt/crypt.c -+++ b/libcrypt/crypt.c -@@ -21,6 +21,9 @@ static const struct { - const crypt_impl_f crypt_impl; - } crypt_impl_tab[] = { - { "$1$", __md5_crypt }, -+#ifdef __UCLIBC_HAS_SHA256_CRYPT_IMPL__ -+ { "$5$", __sha256_crypt }, -+#endif - #ifdef __UCLIBC_HAS_SHA512_CRYPT_IMPL__ - { "$6$", __sha512_crypt }, - #endif -diff --git a/libcrypt/libcrypt.h b/libcrypt/libcrypt.h -index fcad6ae..67733d1 100644 ---- a/libcrypt/libcrypt.h -+++ b/libcrypt/libcrypt.h -@@ -9,9 +9,11 @@ - #define __LIBCRYPT_H__ - - extern char *__md5_crypt(const unsigned char *pw, const unsigned char *salt) attribute_hidden; -+extern char *__sha256_crypt(const unsigned char *pw, const unsigned char *salt) attribute_hidden; - extern char *__sha512_crypt(const unsigned char *pw, const unsigned char *salt) attribute_hidden; - extern char *__des_crypt(const unsigned char *pw, const unsigned char *salt) attribute_hidden; - -+extern char *__sha256_crypt_r (const char *key, const char *salt, char *buffer, int buflen) attribute_hidden; - extern char *__sha512_crypt_r (const char *key, const char *salt, char *buffer, int buflen) attribute_hidden; - - /* shut up gcc-4.x signed warnings */ -diff --git a/libcrypt/sha256-crypt.c b/libcrypt/sha256-crypt.c -new file mode 100644 -index 0000000..4422148 ---- /dev/null -+++ b/libcrypt/sha256-crypt.c -@@ -0,0 +1,326 @@ -+/* One way encryption based on SHA256 sum. -+ Copyright (C) 2007, 2009 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ Contributed by Ulrich Drepper <drepper@redhat.com>, 2007. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, write to the Free -+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -+ 02111-1307 USA. */ -+ -+#include <assert.h> -+#include <errno.h> -+#include <stdbool.h> -+#include <stdlib.h> -+#include <string.h> -+#include <sys/param.h> -+ -+#include "sha256.h" -+#include "libcrypt.h" -+ -+/* Define our magic string to mark salt for SHA256 "encryption" -+ replacement. */ -+static const char sha256_salt_prefix[] = "$5$"; -+ -+/* Prefix for optional rounds specification. */ -+static const char sha256_rounds_prefix[] = "rounds="; -+ -+/* Maximum salt string length. */ -+#define SALT_LEN_MAX 16 -+/* Default number of rounds if not explicitly specified. */ -+#define ROUNDS_DEFAULT 5000 -+/* Minimum number of rounds. */ -+#define ROUNDS_MIN 1000 -+/* Maximum number of rounds. */ -+#define ROUNDS_MAX 999999999 -+ -+/* Table with characters for base64 transformation. */ -+static const char b64t[64] = -+"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; -+ -+#define B64_FROM_24BIT(b2, b1, b0, steps) \ -+ { \ -+ int n = (steps); \ -+ unsigned int w = ((b2) << 16) | ((b1) << 8) | (b0); \ -+ while (n-- > 0 && buflen > 0) \ -+ { \ -+ *cp++ = b64t[w & 0x3f]; \ -+ --buflen; \ -+ w >>= 6; \ -+ } \ -+ } -+ -+char * -+__sha256_crypt_r (const char *key, -+ const char *salt, -+ char *buffer, -+ int buflen) -+{ -+ unsigned char alt_result[32] -+ __attribute__ ((__aligned__ (__alignof__ (uint32_t)))); -+ unsigned char temp_result[32] -+ __attribute__ ((__aligned__ (__alignof__ (uint32_t)))); -+ size_t salt_len; -+ size_t key_len; -+ size_t cnt; -+ char *cp; -+ char *copied_key = NULL; -+ char *copied_salt = NULL; -+ char *p_bytes; -+ char *s_bytes; -+ /* Default number of rounds. */ -+ size_t rounds = ROUNDS_DEFAULT; -+ bool rounds_custom = false; -+ -+ /* Find beginning of salt string. The prefix should normally always -+ be present. Just in case it is not. */ -+ if (strncmp (sha256_salt_prefix, salt, sizeof (sha256_salt_prefix) - 1) == 0) -+ /* Skip salt prefix. */ -+ salt += sizeof (sha256_salt_prefix) - 1; -+ -+ if (strncmp (salt, sha256_rounds_prefix, sizeof (sha256_rounds_prefix) - 1) -+ == 0) -+ { -+ const char *num = salt + sizeof (sha256_rounds_prefix) - 1; -+ char *endp; -+ unsigned long int srounds = strtoul (num, &endp, 10); -+ if (*endp == '$') -+ { -+ salt = endp + 1; -+ rounds = MAX (ROUNDS_MIN, MIN (srounds, ROUNDS_MAX)); -+ rounds_custom = true; -+ } -+ } -+ -+ salt_len = MIN (strcspn (salt, "$"), SALT_LEN_MAX); -+ key_len = strlen (key); -+ -+ if ((key - (char *) 0) % __alignof__ (uint32_t) != 0) -+ { -+ char *tmp = (char *) alloca (key_len + __alignof__ (uint32_t)); -+ key = copied_key = -+ memcpy (tmp + __alignof__ (uint32_t) -+ - (tmp - (char *) 0) % __alignof__ (uint32_t), -+ key, key_len); -+ assert ((key - (char *) 0) % __alignof__ (uint32_t) == 0); -+ } -+ -+ if ((salt - (char *) 0) % __alignof__ (uint32_t) != 0) -+ { -+ char *tmp = (char *) alloca (salt_len + __alignof__ (uint32_t)); -+ salt = copied_salt = -+ memcpy (tmp + __alignof__ (uint32_t) -+ - (tmp - (char *) 0) % __alignof__ (uint32_t), -+ salt, salt_len); -+ assert ((salt - (char *) 0) % __alignof__ (uint32_t) == 0); -+ } -+ -+ struct sha256_ctx ctx; -+ struct sha256_ctx alt_ctx; -+ -+ /* Prepare for the real work. */ -+ __sha256_init_ctx (&ctx); -+ -+ /* Add the key string. */ -+ __sha256_process_bytes (key, key_len, &ctx); -+ -+ /* The last part is the salt string. This must be at most 16 -+ characters and it ends at the first `$' character. */ -+ __sha256_process_bytes (salt, salt_len, &ctx); -+ -+ -+ /* Compute alternate SHA256 sum with input KEY, SALT, and KEY. The -+ final result will be added to the first context. */ -+ __sha256_init_ctx (&alt_ctx); -+ -+ /* Add key. */ -+ __sha256_process_bytes (key, key_len, &alt_ctx); -+ -+ /* Add salt. */ -+ __sha256_process_bytes (salt, salt_len, &alt_ctx); -+ -+ /* Add key again. */ -+ __sha256_process_bytes (key, key_len, &alt_ctx); -+ -+ /* Now get result of this (32 bytes) and add it to the other -+ context. */ -+ __sha256_finish_ctx (&alt_ctx, alt_result); -+ -+ /* Add for any character in the key one byte of the alternate sum. */ -+ for (cnt = key_len; cnt > 32; cnt -= 32) -+ __sha256_process_bytes (alt_result, 32, &ctx); -+ __sha256_process_bytes (alt_result, cnt, &ctx); -+ -+ /* Take the binary representation of the length of the key and for every -+ 1 add the alternate sum, for every 0 the key. */ -+ for (cnt = key_len; cnt > 0; cnt >>= 1) -+ if ((cnt & 1) != 0) -+ __sha256_process_bytes (alt_result, 32, &ctx); -+ else -+ __sha256_process_bytes (key, key_len, &ctx); -+ -+ /* Create intermediate result. */ -+ __sha256_finish_ctx (&ctx, alt_result); -+ -+ /* Start computation of P byte sequence. */ -+ __sha256_init_ctx (&alt_ctx); -+ -+ /* For every character in the password add the entire password. */ -+ for (cnt = 0; cnt < key_len; ++cnt) -+ __sha256_process_bytes (key, key_len, &alt_ctx); -+ -+ /* Finish the digest. */ -+ __sha256_finish_ctx (&alt_ctx, temp_result); -+ -+ /* Create byte sequence P. */ -+ cp = p_bytes = alloca (key_len); -+ for (cnt = key_len; cnt >= 32; cnt -= 32) -+ cp = mempcpy (cp, temp_result, 32); -+ memcpy (cp, temp_result, cnt); -+ -+ /* Start computation of S byte sequence. */ -+ __sha256_init_ctx (&alt_ctx); -+ -+ /* For every character in the password add the entire password. */ -+ for (cnt = 0; cnt < 16 + alt_result[0]; ++cnt) -+ __sha256_process_bytes (salt, salt_len, &alt_ctx); -+ -+ /* Finish the digest. */ -+ __sha256_finish_ctx (&alt_ctx, temp_result); -+ -+ /* Create byte sequence S. */ -+ cp = s_bytes = alloca (salt_len); -+ for (cnt = salt_len; cnt >= 32; cnt -= 32) -+ cp = mempcpy (cp, temp_result, 32); -+ memcpy (cp, temp_result, cnt); -+ -+ /* Repeatedly run the collected hash value through SHA256 to burn -+ CPU cycles. */ -+ for (cnt = 0; cnt < rounds; ++cnt) -+ { -+ /* New context. */ -+ __sha256_init_ctx (&ctx); -+ -+ /* Add key or last result. */ -+ if ((cnt & 1) != 0) -+ __sha256_process_bytes (p_bytes, key_len, &ctx); -+ else -+ __sha256_process_bytes (alt_result, 32, &ctx); -+ -+ /* Add salt for numbers not divisible by 3. */ -+ if (cnt % 3 != 0) -+ __sha256_process_bytes (s_bytes, salt_len, &ctx); -+ -+ /* Add key for numbers not divisible by 7. */ -+ if (cnt % 7 != 0) -+ __sha256_process_bytes (p_bytes, key_len, &ctx); -+ -+ /* Add key or last result. */ -+ if ((cnt & 1) != 0) -+ __sha256_process_bytes (alt_result, 32, &ctx); -+ else -+ __sha256_process_bytes (p_bytes, key_len, &ctx); -+ -+ /* Create intermediate result. */ -+ __sha256_finish_ctx (&ctx, alt_result); -+ } -+ -+ /* Now we can construct the result string. It consists of three -+ parts. */ -+ cp = stpncpy (buffer, sha256_salt_prefix, MAX (0, buflen)); -+ buflen -= sizeof (sha256_salt_prefix) - 1; -+ -+ if (rounds_custom) -+ { -+ int n = snprintf (cp, MAX (0, buflen), "%s%zu$", -+ sha256_rounds_prefix, rounds); -+ cp += n; -+ buflen -= n; -+ } -+ -+ cp = stpncpy (cp, salt, MIN ((size_t) MAX (0, buflen), salt_len)); -+ buflen -= MIN ((size_t) MAX (0, buflen), salt_len); -+ -+ if (buflen > 0) -+ { -+ *cp++ = '$'; -+ --buflen; -+ } -+ -+ B64_FROM_24BIT (alt_result[0], alt_result[10], alt_result[20], 4); -+ B64_FROM_24BIT (alt_result[21], alt_result[1], alt_result[11], 4); -+ B64_FROM_24BIT (alt_result[12], alt_result[22], alt_result[2], 4); -+ B64_FROM_24BIT (alt_result[3], alt_result[13], alt_result[23], 4); -+ B64_FROM_24BIT (alt_result[24], alt_result[4], alt_result[14], 4); -+ B64_FROM_24BIT (alt_result[15], alt_result[25], alt_result[5], 4); -+ B64_FROM_24BIT (alt_result[6], alt_result[16], alt_result[26], 4); -+ B64_FROM_24BIT (alt_result[27], alt_result[7], alt_result[17], 4); -+ B64_FROM_24BIT (alt_result[18], alt_result[28], alt_result[8], 4); -+ B64_FROM_24BIT (alt_result[9], alt_result[19], alt_result[29], 4); -+ B64_FROM_24BIT (0, alt_result[31], alt_result[30], 3); -+ if (buflen <= 0) -+ { -+ __set_errno (ERANGE); -+ buffer = NULL; -+ } -+ else -+ *cp = '\0'; /* Terminate the string. */ -+ -+ /* Clear the buffer for the intermediate result so that people -+ attaching to processes or reading core dumps cannot get any -+ information. We do it in this way to clear correct_words[] -+ inside the SHA256 implementation as well. */ -+ __sha256_init_ctx (&ctx); -+ __sha256_finish_ctx (&ctx, alt_result); -+ memset (&ctx, '\0', sizeof (ctx)); -+ memset (&alt_ctx, '\0', sizeof (alt_ctx)); -+ -+ memset (temp_result, '\0', sizeof (temp_result)); -+ memset (p_bytes, '\0', key_len); -+ memset (s_bytes, '\0', salt_len); -+ if (copied_key != NULL) -+ memset (copied_key, '\0', key_len); -+ if (copied_salt != NULL) -+ memset (copied_salt, '\0', salt_len); -+ -+ return buffer; -+} -+ -+static char *buffer; -+ -+/* This entry point is equivalent to the `crypt' function in Unix -+ libcs. */ -+char * -+__sha256_crypt (const unsigned char *key, const unsigned char *salt) -+{ -+ /* We don't want to have an arbitrary limit in the size of the -+ password. We can compute an upper bound for the size of the -+ result in advance and so we can prepare the buffer we pass to -+ `sha256_crypt_r'. */ -+ static int buflen; -+ int needed = (sizeof (sha256_salt_prefix) - 1 -+ + sizeof (sha256_rounds_prefix) + 9 + 1 -+ + strlen (salt) + 1 + 43 + 1); -+ -+ if (buflen < needed) -+ { -+ char *new_buffer = (char *) realloc (buffer, needed); -+ if (new_buffer == NULL) -+ return NULL; -+ -+ buffer = new_buffer; -+ buflen = needed; -+ } -+ -+ return __sha256_crypt_r ((const char *) key, (const char *) salt, buffer, buflen); -+} -diff --git a/libcrypt/sha256.c b/libcrypt/sha256.c -new file mode 100644 -index 0000000..e652a67 ---- /dev/null -+++ b/libcrypt/sha256.c -@@ -0,0 +1,294 @@ -+/* Functions to compute SHA256 message digest of files or memory blocks. -+ according to the definition of SHA256 in FIPS 180-2. -+ Copyright (C) 2007 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, write to the Free -+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -+ 02111-1307 USA. */ -+ -+/* Written by Ulrich Drepper <drepper@redhat.com>, 2007. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <endian.h> -+#include <stdlib.h> -+#include <string.h> -+#include <sys/types.h> -+ -+#include "sha256.h" -+ -+#if __BYTE_ORDER == __LITTLE_ENDIAN -+# ifdef _LIBC -+# include <byteswap.h> -+# define SWAP(n) bswap_32 (n) -+# else -+# define SWAP(n) \ -+ (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24)) -+# endif -+#else -+# define SWAP(n) (n) -+#endif -+ -+ -+/* This array contains the bytes used to pad the buffer to the next -+ 64-byte boundary. (FIPS 180-2:5.1.1) */ -+static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ... */ }; -+ -+ -+/* Constants for SHA256 from FIPS 180-2:4.2.2. */ -+static const uint32_t K[64] = -+ { -+ 0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, -+ 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5, -+ 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, -+ 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, -+ 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, -+ 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da, -+ 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, -+ 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967, -+ 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, -+ 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, -+ 0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, -+ 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070, -+ 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, -+ 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3, -+ 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, -+ 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2 -+ }; -+ -+ -+/* Process LEN bytes of BUFFER, accumulating context into CTX. -+ It is assumed that LEN % 64 == 0. */ -+static void -+sha256_process_block (const void *buffer, size_t len, struct sha256_ctx *ctx) -+{ -+ const uint32_t *words = buffer; -+ size_t nwords = len / sizeof (uint32_t); -+ uint32_t a = ctx->H[0]; -+ uint32_t b = ctx->H[1]; -+ uint32_t c = ctx->H[2]; -+ uint32_t d = ctx->H[3]; -+ uint32_t e = ctx->H[4]; -+ uint32_t f = ctx->H[5]; -+ uint32_t g = ctx->H[6]; -+ uint32_t h = ctx->H[7]; -+ -+ /* First increment the byte count. FIPS 180-2 specifies the possible -+ length of the file up to 2^64 bits. Here we only compute the -+ number of bytes. Do a double word increment. */ -+ ctx->total[0] += len; -+ if (ctx->total[0] < len) -+ ++ctx->total[1]; -+ -+ /* Process all bytes in the buffer with 64 bytes in each round of -+ the loop. */ -+ while (nwords > 0) -+ { -+ uint32_t W[64]; -+ uint32_t a_save = a; -+ uint32_t b_save = b; -+ uint32_t c_save = c; -+ uint32_t d_save = d; -+ uint32_t e_save = e; -+ uint32_t f_save = f; -+ uint32_t g_save = g; -+ uint32_t h_save = h; -+ -+ /* Operators defined in FIPS 180-2:4.1.2. */ -+#define Ch(x, y, z) ((x & y) ^ (~x & z)) -+#define Maj(x, y, z) ((x & y) ^ (x & z) ^ (y & z)) -+#define S0(x) (CYCLIC (x, 2) ^ CYCLIC (x, 13) ^ CYCLIC (x, 22)) -+#define S1(x) (CYCLIC (x, 6) ^ CYCLIC (x, 11) ^ CYCLIC (x, 25)) -+#define R0(x) (CYCLIC (x, 7) ^ CYCLIC (x, 18) ^ (x >> 3)) -+#define R1(x) (CYCLIC (x, 17) ^ CYCLIC (x, 19) ^ (x >> 10)) -+ -+ /* It is unfortunate that C does not provide an operator for -+ cyclic rotation. Hope the C compiler is smart enough. */ -+#define CYCLIC(w, s) ((w >> s) | (w << (32 - s))) -+ -+ /* Compute the message schedule according to FIPS 180-2:6.2.2 step 2. */ -+ for (unsigned int t = 0; t < 16; ++t) -+ { -+ W[t] = SWAP (*words); -+ ++words; -+ } -+ for (unsigned int t = 16; t < 64; ++t) -+ W[t] = R1 (W[t - 2]) + W[t - 7] + R0 (W[t - 15]) + W[t - 16]; -+ -+ /* The actual computation according to FIPS 180-2:6.2.2 step 3. */ -+ for (unsigned int t = 0; t < 64; ++t) -+ { -+ uint32_t T1 = h + S1 (e) + Ch (e, f, g) + K[t] + W[t]; -+ uint32_t T2 = S0 (a) + Maj (a, b, c); -+ h = g; -+ g = f; -+ f = e; -+ e = d + T1; -+ d = c; -+ c = b; -+ b = a; -+ a = T1 + T2; -+ } -+ -+ /* Add the starting values of the context according to FIPS 180-2:6.2.2 -+ step 4. */ -+ a += a_save; -+ b += b_save; -+ c += c_save; -+ d += d_save; -+ e += e_save; -+ f += f_save; -+ g += g_save; -+ h += h_save; -+ -+ /* Prepare for the next round. */ -+ nwords -= 16; -+ } -+ -+ /* Put checksum in context given as argument. */ -+ ctx->H[0] = a; -+ ctx->H[1] = b; -+ ctx->H[2] = c; -+ ctx->H[3] = d; -+ ctx->H[4] = e; -+ ctx->H[5] = f; -+ ctx->H[6] = g; -+ ctx->H[7] = h; -+} -+ -+ -+/* Initialize structure containing state of computation. -+ (FIPS 180-2:5.3.2) */ -+void -+__sha256_init_ctx (struct sha256_ctx *ctx) -+{ -+ ctx->H[0] = 0x6a09e667; -+ ctx->H[1] = 0xbb67ae85; -+ ctx->H[2] = 0x3c6ef372; -+ ctx->H[3] = 0xa54ff53a; -+ ctx->H[4] = 0x510e527f; -+ ctx->H[5] = 0x9b05688c; -+ ctx->H[6] = 0x1f83d9ab; -+ ctx->H[7] = 0x5be0cd19; -+ -+ ctx->total[0] = ctx->total[1] = 0; -+ ctx->buflen = 0; -+} -+ -+ -+/* Process the remaining bytes in the internal buffer and the usual -+ prolog according to the standard and write the result to RESBUF. -+ -+ IMPORTANT: On some systems it is required that RESBUF is correctly -+ aligned for a 32 bits value. */ -+void * -+__sha256_finish_ctx (struct sha256_ctx *ctx, void *resbuf) -+{ -+ /* Take yet unprocessed bytes into account. */ -+ uint32_t bytes = ctx->buflen; -+ size_t pad; -+ -+ /* Now count remaining bytes. */ -+ ctx->total[0] += bytes; -+ if (ctx->total[0] < bytes) -+ ++ctx->total[1]; -+ -+ pad = bytes >= 56 ? 64 + 56 - bytes : 56 - bytes; -+ memcpy (&ctx->buffer[bytes], fillbuf, pad); -+ -+ /* Put the 64-bit file length in *bits* at the end of the buffer. */ -+ *(uint32_t *) &ctx->buffer[bytes + pad + 4] = SWAP (ctx->total[0] << 3); -+ *(uint32_t *) &ctx->buffer[bytes + pad] = SWAP ((ctx->total[1] << 3) | -+ (ctx->total[0] >> 29)); -+ -+ /* Process last bytes. */ -+ sha256_process_block (ctx->buffer, bytes + pad + 8, ctx); -+ -+ /* Put result from CTX in first 32 bytes following RESBUF. */ -+ for (unsigned int i = 0; i < 8; ++i) -+ ((uint32_t *) resbuf)[i] = SWAP (ctx->H[i]); -+ -+ return resbuf; -+} -+ -+ -+void -+__sha256_process_bytes (const void *buffer, size_t len, struct sha256_ctx *ctx) -+{ -+ /* When we already have some bits in our internal buffer concatenate -+ both inputs first. */ -+ if (ctx->buflen != 0) -+ { -+ size_t left_over = ctx->buflen; -+ size_t add = 128 - left_over > len ? len : 128 - left_over; -+ -+ memcpy (&ctx->buffer[left_over], buffer, add); -+ ctx->buflen += add; -+ -+ if (ctx->buflen > 64) -+ { -+ sha256_process_block (ctx->buffer, ctx->buflen & ~63, ctx); -+ -+ ctx->buflen &= 63; -+ /* The regions in the following copy operation cannot overlap. */ -+ memcpy (ctx->buffer, &ctx->buffer[(left_over + add) & ~63], -+ ctx->buflen); -+ } -+ -+ buffer = (const char *) buffer + add; -+ len -= add; -+ } -+ -+ /* Process available complete blocks. */ -+ if (len >= 64) -+ { -+#if __GNUC__ >= 2 -+# define UNALIGNED_P(p) (((uintptr_t) p) % __alignof__ (uint32_t) != 0) -+#else -+# define UNALIGNED_P(p) (((uintptr_t) p) % sizeof (uint32_t) != 0) -+#endif -+ if (UNALIGNED_P (buffer)) -+ while (len > 64) -+ { -+ sha256_process_block (memcpy (ctx->buffer, buffer, 64), 64, ctx); -+ buffer = (const char *) buffer + 64; -+ len -= 64; -+ } -+ else -+ { -+ sha256_process_block (buffer, len & ~63, ctx); -+ buffer = (const char *) buffer + (len & ~63); -+ len &= 63; -+ } -+ } -+ -+ /* Move remaining bytes into internal buffer. */ -+ if (len > 0) -+ { -+ size_t left_over = ctx->buflen; -+ -+ memcpy (&ctx->buffer[left_over], buffer, len); -+ left_over += len; -+ if (left_over >= 64) -+ { -+ sha256_process_block (ctx->buffer, 64, ctx); -+ left_over -= 64; -+ memcpy (ctx->buffer, &ctx->buffer[64], left_over); -+ } -+ ctx->buflen = left_over; -+ } -+} -diff --git a/libcrypt/sha256.h b/libcrypt/sha256.h -new file mode 100644 -index 0000000..291674f ---- /dev/null -+++ b/libcrypt/sha256.h -@@ -0,0 +1,58 @@ -+/* Declaration of functions and data types used for SHA256 sum computing -+ library functions. -+ Copyright (C) 2007 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, write to the Free -+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -+ 02111-1307 USA. */ -+ -+#ifndef _SHA256_H -+#define _SHA256_H 1 -+ -+#include <limits.h> -+#include <stdint.h> -+#include <stdio.h> -+ -+ -+/* Structure to save state of computation between the single steps. */ -+struct sha256_ctx -+{ -+ uint32_t H[8]; -+ -+ uint32_t total[2]; -+ uint32_t buflen; -+ char buffer[128] __attribute__ ((__aligned__ (__alignof__ (uint32_t)))); -+}; -+ -+/* Initialize structure containing state of computation. -+ (FIPS 180-2: 5.3.2) */ -+extern void __sha256_init_ctx (struct sha256_ctx *ctx) attribute_hidden; -+ -+/* Starting with the result of former calls of this function (or the -+ initialization function update the context for the next LEN bytes -+ starting at BUFFER. -+ It is NOT required that LEN is a multiple of 64. */ -+extern void __sha256_process_bytes (const void *buffer, size_t len, -+ struct sha256_ctx *ctx) attribute_hidden; -+ -+/* Process the remaining bytes in the buffer and put result from CTX -+ in first 32 bytes following RESBUF. -+ -+ IMPORTANT: On some systems it is required that RESBUF is correctly -+ aligned for a 32 bits value. */ -+extern void *__sha256_finish_ctx (struct sha256_ctx *ctx, void *resbuf) -+ attribute_hidden; -+ -+#endif /* sha256.h */ --- -1.7.7.3 - diff --git a/main/libc0.9.32/uclibc-epoll_pwait-hack.patch b/main/libc0.9.32/uclibc-epoll_pwait-hack.patch deleted file mode 100644 index 7e28056848..0000000000 --- a/main/libc0.9.32/uclibc-epoll_pwait-hack.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/libc/sysdeps/linux/common/epoll.c b/libc/sysdeps/linux/common/epoll.c -index 85b0cfd..8fff9e6 100644 ---- a/libc/sysdeps/linux/common/epoll.c -+++ b/libc/sysdeps/linux/common/epoll.c -@@ -67,12 +67,13 @@ extern __typeof(epoll_pwait) __libc_epoll_pwait; - int __libc_epoll_pwait(int epfd, struct epoll_event *events, int maxevents, - int timeout, const sigset_t *set) - { -+ int n = _NSIG / 8; - if (SINGLE_THREAD_P) -- return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8); -+ return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, n); - # ifdef __UCLIBC_HAS_THREADS_NATIVE__ - else { - int oldtype = LIBC_CANCEL_ASYNC (); -- int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8); -+ int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, n); - LIBC_CANCEL_RESET (oldtype); - return result; - } diff --git a/main/libc0.9.32/uclibc-resolv-cname-fix.diff b/main/libc0.9.32/uclibc-resolv-cname-fix.diff deleted file mode 100644 index cf5e777f7e..0000000000 --- a/main/libc0.9.32/uclibc-resolv-cname-fix.diff +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c -index 1e394d4..03d68fe 100644 ---- a/libc/inet/resolv.c -+++ b/libc/inet/resolv.c -@@ -3099,11 +3099,9 @@ int res_query(const char *dname, int class, int type, - - free(a.dotted); - -- if (a.atype == type) { /* CNAME */ -- if (i > anslen) -- i = anslen; -- memcpy(answer, packet, i); -- } -+ i = MIN(anslen, i); -+ memcpy(answer, packet, i); -+ - free(packet); - return i; - } diff --git a/main/libc0.9.32/uclibc-ubacktrace-asneeded-fix.patch b/main/libc0.9.32/uclibc-ubacktrace-asneeded-fix.patch deleted file mode 100644 index 8fc06508eb..0000000000 --- a/main/libc0.9.32/uclibc-ubacktrace-asneeded-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- uClibc-0.9.32-rc3.orig/Makefile.in -+++ uClibc-0.9.32-rc3/Makefile.in -@@ -336,7 +336,7 @@ - endif - ifeq ($(UCLIBC_HAS_BACKTRACE),y) - # Add the AS_NEEDED entry for libubacktrace.so -- if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR)/$(SHARED_LIBNAME) ] ; then \ -+ if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libc.so ] ; then \ - echo "GROUP ( $(UBACKTRACE_ASNEEDED) )" >> $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libc.so; \ - fi - endif ---- uClibc-0.9.32-rc3.orig/Rules.mak -+++ uClibc-0.9.32-rc3/Rules.mak -@@ -118,7 +118,7 @@ - - LIBC := libc - SHARED_LIBNAME := $(LIBC).so.$(ABI_VERSION) --UBACKTRACE_DSO := libubacktrace.so.$(MAJOR_VERSION) -+UBACKTRACE_DSO := libubacktrace.so.$(ABI_VERSION) - ifneq ($(findstring $(TARGET_ARCH) , hppa64 ia64 mips64 powerpc64 s390x sparc64 x86_64 ),) - UCLIBC_LDSO_NAME := ld64-uClibc - ARCH_NATIVE_BIT := 64 diff --git a/main/libdrm/APKBUILD b/main/libdrm/APKBUILD index a723328170..6b53b1a4bf 100644 --- a/main/libdrm/APKBUILD +++ b/main/libdrm/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libdrm -pkgver=2.4.27 +pkgver=2.4.29 pkgrel=0 pkgdesc="Userspace interface to kernel DRM services" url="http://dri.freedesktop.org/" @@ -25,4 +25,4 @@ package() { rm "$pkgdir"/usr/lib/*.la || return 1 } -md5sums="0fba4f42735cd3d24dd7a8cde0023fbd libdrm-2.4.27.tar.bz2" +md5sums="96d5e3e9edd55f4b016fe3b5dd0a1953 libdrm-2.4.29.tar.bz2" diff --git a/main/libgsf/APKBUILD b/main/libgsf/APKBUILD index 2310e91f9e..fce0ab7bb2 100644 --- a/main/libgsf/APKBUILD +++ b/main/libgsf/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libgsf -pkgver=1.14.21 -pkgrel=1 +pkgver=1.14.22 +pkgrel=0 pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats." url="http://www.gnome.org/" arch="all" @@ -9,7 +9,7 @@ license="GPL LGPL" subpackages="$pkgname-dev $pkgname-doc" depends= makedepends="libxml2-dev glib-dev bzip2-dev intltool python zlib-dev" -source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.tar.bz2" +source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.tar.xz" depends_dev="glib-dev bzip2-dev libxml2-dev pkgconfig" @@ -33,4 +33,4 @@ package() { rm -f "$pkgdir"/usr/share/man/man1/gsf-office-thumbnailer.1 } -md5sums="2b702648b853402554c97d75405c60d3 libgsf-1.14.21.tar.bz2" +md5sums="5d4d26767ca5de505435f5fabee2e4c1 libgsf-1.14.22.tar.xz" diff --git a/main/libraw/APKBUILD b/main/libraw/APKBUILD index d4745f8d70..d0cf200ced 100644 --- a/main/libraw/APKBUILD +++ b/main/libraw/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libraw -pkgver=0.14.3 +pkgver=0.14.4 pkgrel=0 pkgdesc="Library for reading RAW files obtained from digital photo cameras" url="http://www.libraw.org/" @@ -35,4 +35,4 @@ package() { } -md5sums="d8f81a52b0fada9d5bf7e659e21e3a57 LibRaw-0.14.3.tar.gz" +md5sums="c198292e9997f056a8d1f8ac03401442 LibRaw-0.14.4.tar.gz" diff --git a/main/libxi/APKBUILD b/main/libxi/APKBUILD index 19b4b19057..c0298da9d6 100644 --- a/main/libxi/APKBUILD +++ b/main/libxi/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxi -pkgver=1.4.3 +pkgver=1.4.4 pkgrel=0 pkgdesc="X11 Input extension library" url="http://xorg.freedesktop.org" @@ -33,4 +33,4 @@ package() { rm "$pkgdir"/usr/lib/*.la || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="792e8a7ddc7175911d69f823d38eaff6 libXi-1.4.3.tar.bz2" +md5sums="299f36c6d6a586ab33aa5c1d97d93078 libXi-1.4.4.tar.bz2" diff --git a/main/lighttpd/APKBUILD b/main/lighttpd/APKBUILD index 623fde2848..b4a4d5ac8d 100644 --- a/main/lighttpd/APKBUILD +++ b/main/lighttpd/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lighttpd -pkgver=1.4.29 +pkgver=1.4.30 _streamver=2.2.0 -pkgrel=2 +pkgrel=0 pkgdesc="a secure, fast, compliant and very flexible web-server" url="http://www.lighttpd.net/" arch="all" @@ -126,7 +126,7 @@ mod_webdav() { } -md5sums="e6e67b09986cb504db630b5a86b2dd76 lighttpd-1.4.29.tar.bz2 +md5sums="63f9df52dcae0ab5689a95c99c54e48a lighttpd-1.4.30.tar.bz2 ac37885c881a058194405232e7737a7a lighttpd-1.4.18_mod_h264_streaming-2.2.0.tar.gz e37770e4eed20390806a2420a3970fcd lighttpd.initd 0dede109282bfe685bdec6b35f0e4b6b lighttpd.confd diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 82023d60ed..e16e6af24e 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -2,9 +2,9 @@ _flavor=grsec pkgname=linux-${_flavor} -pkgver=3.0.12 +pkgver=3.0.14 _kernver=3.0 -pkgrel=2 +pkgrel=0 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs linux-firmware" @@ -20,6 +20,10 @@ source="ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-$_kernver.tar.bz2 0001-ip_gre-dont-increase-dev-needed_headroom-on-a-live-d.patch 0004-arp-flush-arp-cache-on-device-change.patch + x86-centaur-enable-cx8-for-via-eden-too.patch + linux-3.0.x-regression-with-ipv4-routes-having-mtu.patch + net-flow-remove-sleeping-and-deferral-mechanism-from-flow_cache_flush.patch + kernelconfig.x86 kernelconfig.x86_64 " @@ -139,10 +143,13 @@ dev() { } md5sums="398e95866794def22b12dfbc15ce89c0 linux-3.0.tar.bz2 -b3030035fcc87c55ede362a47113af5d patch-3.0.12.bz2 -a129184102c16a4ee39afe50cae43efd grsecurity-2.2.2-3.0.12-unofficial.patch +f2745bd4dcb3267414713adff403b54c patch-3.0.14.bz2 +3c0fcf923a27a963ae86a3e694cb6bbd grsecurity-2.2.2-3.0.14-unofficial.patch c41cf0ee9794f393423c6b2093072260 grsec-timblogiw-noconst.patch ebb99ef6ad8cd2d9fd8f49d5c5849057 0001-ip_gre-dont-increase-dev-needed_headroom-on-a-live-d.patch 776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch +f3eda7112ef074a4121ec6de943c63ee x86-centaur-enable-cx8-for-via-eden-too.patch +62cc7d7b5ba7ef05b72ff91c0411c189 linux-3.0.x-regression-with-ipv4-routes-having-mtu.patch +b25335e8fcbf8c969230d55ac4e75cf8 net-flow-remove-sleeping-and-deferral-mechanism-from-flow_cache_flush.patch 587b1fb2f6a5c9ba714900b856f57f09 kernelconfig.x86 99836ffe918bbdef7da1a56a3d075c7a kernelconfig.x86_64" diff --git a/main/linux-grsec/grsecurity-2.2.2-3.0.12-unofficial.patch b/main/linux-grsec/grsecurity-2.2.2-3.0.14-unofficial.patch index 8fad8f4f85..c4c0b6ef42 100644 --- a/main/linux-grsec/grsecurity-2.2.2-3.0.12-unofficial.patch +++ b/main/linux-grsec/grsecurity-2.2.2-3.0.14-unofficial.patch @@ -158,7 +158,7 @@ index aa47be7..1fbd18f 100644 pcd. [PARIDE] diff --git a/Makefile b/Makefile -index 993fe05..8ddd85b 100644 +index f4f577b..9e9b120 100644 --- a/Makefile +++ b/Makefile @@ -245,8 +245,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ @@ -708,7 +708,7 @@ index acca35a..f7debc1 100644 EXPORT_SYMBOL(__get_user_1); diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c -index 5e1e541..6af2d90 100644 +index 74ae833..8749ecb 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -28,7 +28,6 @@ @@ -719,7 +719,7 @@ index 5e1e541..6af2d90 100644 #include <linux/hw_breakpoint.h> #include <asm/cacheflush.h> -@@ -479,12 +478,6 @@ unsigned long get_wchan(struct task_struct *p) +@@ -482,12 +481,6 @@ unsigned long get_wchan(struct task_struct *p) return 0; } @@ -15913,7 +15913,7 @@ index 42eb330..139955c 100644 return ret; diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c -index 9242436..753954d 100644 +index d4a705f..ef8f1a9 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -35,7 +35,7 @@ void (*pm_power_off)(void); @@ -15925,7 +15925,7 @@ index 9242436..753954d 100644 enum reboot_type reboot_type = BOOT_ACPI; int reboot_force; -@@ -315,13 +315,17 @@ core_initcall(reboot_init); +@@ -324,13 +324,17 @@ core_initcall(reboot_init); extern const unsigned char machine_real_restart_asm[]; extern const u64 machine_real_restart_gdt[3]; @@ -15945,7 +15945,7 @@ index 9242436..753954d 100644 local_irq_disable(); /* Write zero to CMOS register number 0x0f, which the BIOS POST -@@ -347,14 +351,14 @@ void machine_real_restart(unsigned int type) +@@ -356,14 +360,14 @@ void machine_real_restart(unsigned int type) boot)". This seems like a fairly standard thing that gets set by REBOOT.COM programs, and the previous reset routine did this too. */ @@ -15962,7 +15962,7 @@ index 9242436..753954d 100644 /* GDT[0]: GDT self-pointer */ lowmem_gdt[0] = -@@ -365,7 +369,33 @@ void machine_real_restart(unsigned int type) +@@ -374,7 +378,33 @@ void machine_real_restart(unsigned int type) GDT_ENTRY(0x009b, restart_pa, 0xffff); /* Jump to the identity-mapped low memory code */ @@ -15996,7 +15996,7 @@ index 9242436..753954d 100644 } #ifdef CONFIG_APM_MODULE EXPORT_SYMBOL(machine_real_restart); -@@ -523,7 +553,7 @@ void __attribute__((weak)) mach_reboot_fixups(void) +@@ -532,7 +562,7 @@ void __attribute__((weak)) mach_reboot_fixups(void) * try to force a triple fault and then cycle between hitting the keyboard * controller and doing that */ @@ -16005,7 +16005,7 @@ index 9242436..753954d 100644 { int i; int attempt = 0; -@@ -647,13 +677,13 @@ void native_machine_shutdown(void) +@@ -656,13 +686,13 @@ void native_machine_shutdown(void) #endif } @@ -16021,7 +16021,7 @@ index 9242436..753954d 100644 { printk("machine restart\n"); -@@ -662,7 +692,7 @@ static void native_machine_restart(char *__unused) +@@ -671,7 +701,7 @@ static void native_machine_restart(char *__unused) __machine_emergency_restart(0); } @@ -16030,7 +16030,7 @@ index 9242436..753954d 100644 { /* stop other cpus and apics */ machine_shutdown(); -@@ -673,7 +703,7 @@ static void native_machine_halt(void) +@@ -682,7 +712,7 @@ static void native_machine_halt(void) stop_this_cpu(NULL); } @@ -16039,7 +16039,7 @@ index 9242436..753954d 100644 { if (pm_power_off) { if (!reboot_force) -@@ -682,6 +712,7 @@ static void native_machine_power_off(void) +@@ -691,6 +721,7 @@ static void native_machine_power_off(void) } /* a fallback in case there is no PM info available */ tboot_shutdown(TB_SHUTDOWN_HALT); @@ -21096,10 +21096,10 @@ index 2dbf6bf..4a744ee 100644 + return ret ? -EFAULT : 0; +} diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c -index ea30585..b5e1508 100644 +index dd74e46..7d26398 100644 --- a/arch/x86/mm/gup.c +++ b/arch/x86/mm/gup.c -@@ -253,7 +253,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write, +@@ -255,7 +255,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write, addr = start; len = (unsigned long) nr_pages << PAGE_SHIFT; end = start + len; @@ -21109,10 +21109,10 @@ index ea30585..b5e1508 100644 return 0; diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c -index b499626..6fd1882 100644 +index f4f29b1..5cac4fb 100644 --- a/arch/x86/mm/highmem_32.c +++ b/arch/x86/mm/highmem_32.c -@@ -44,7 +44,10 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot) +@@ -44,7 +44,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot) idx = type + KM_TYPE_NR*smp_processor_id(); vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); BUG_ON(!pte_none(*(kmap_pte-idx))); @@ -21120,9 +21120,10 @@ index b499626..6fd1882 100644 + pax_open_kernel(); set_pte(kmap_pte-idx, mk_pte(page, prot)); + pax_close_kernel(); ++ + arch_flush_lazy_mmu_mode(); return (void *)vaddr; - } diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c index f581a18..29efd37 100644 --- a/arch/x86/mm/hugetlbpage.c @@ -26871,7 +26872,7 @@ index a365be0..a629755 100644 return -EINVAL; } diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c -index 82db185..c935ce3 100644 +index 1367ced..f2ec98d 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -1372,7 +1372,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data, @@ -26921,7 +26922,7 @@ index 82db185..c935ce3 100644 if (!num_clips != !clips_ptr) { ret = -EINVAL; -@@ -2270,7 +2270,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev, +@@ -2274,7 +2274,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev, out_resp->flags = property->flags; if ((out_resp->count_values >= value_count) && value_count) { @@ -26930,7 +26931,7 @@ index 82db185..c935ce3 100644 for (i = 0; i < value_count; i++) { if (copy_to_user(values_ptr + i, &property->values[i], sizeof(uint64_t))) { ret = -EFAULT; -@@ -2283,7 +2283,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev, +@@ -2287,7 +2287,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev, if (property->flags & DRM_MODE_PROP_ENUM) { if ((out_resp->count_enum_blobs >= enum_count) && enum_count) { copied = 0; @@ -26939,7 +26940,7 @@ index 82db185..c935ce3 100644 list_for_each_entry(prop_enum, &property->enum_blob_list, head) { if (copy_to_user(&enum_ptr[copied].value, &prop_enum->value, sizeof(uint64_t))) { -@@ -2306,7 +2306,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev, +@@ -2310,7 +2310,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev, if ((out_resp->count_enum_blobs >= blob_count) && blob_count) { copied = 0; blob_id_ptr = (uint32_t *)(unsigned long)out_resp->enum_blob_ptr; @@ -26948,7 +26949,7 @@ index 82db185..c935ce3 100644 list_for_each_entry(prop_blob, &property->enum_blob_list, head) { if (put_user(prop_blob->base.id, blob_id_ptr + copied)) { -@@ -2367,7 +2367,7 @@ int drm_mode_getblob_ioctl(struct drm_device *dev, +@@ -2371,7 +2371,7 @@ int drm_mode_getblob_ioctl(struct drm_device *dev, struct drm_mode_get_blob *out_resp = data; struct drm_property_blob *blob; int ret = 0; @@ -26957,7 +26958,7 @@ index 82db185..c935ce3 100644 if (!drm_core_check_feature(dev, DRIVER_MODESET)) return -EINVAL; -@@ -2381,7 +2381,7 @@ int drm_mode_getblob_ioctl(struct drm_device *dev, +@@ -2385,7 +2385,7 @@ int drm_mode_getblob_ioctl(struct drm_device *dev, blob = obj_to_blob(obj); if (out_resp->length == blob->length) { @@ -27355,7 +27356,7 @@ index 4934cf8..52e8e83 100644 /* The actual obj->write_domain will be updated with * pending_write_domain after we emit the accumulated flush for all diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c -index 9b1d669..d88e72c 100644 +index 3635647..1ad5700 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -473,7 +473,7 @@ static irqreturn_t ivybridge_irq_handler(DRM_IRQ_ARGS) @@ -27376,7 +27377,7 @@ index 9b1d669..d88e72c 100644 if (IS_GEN6(dev)) bsd_usr_interrupt = GT_GEN6_BSD_USER_INTERRUPT; -@@ -1226,7 +1226,7 @@ static irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS) +@@ -1227,7 +1227,7 @@ static irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS) int ret = IRQ_NONE, pipe; bool blc_event = false; @@ -27385,7 +27386,7 @@ index 9b1d669..d88e72c 100644 iir = I915_READ(IIR); -@@ -1735,7 +1735,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev) +@@ -1736,7 +1736,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev) { drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; @@ -27394,7 +27395,7 @@ index 9b1d669..d88e72c 100644 INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func); INIT_WORK(&dev_priv->error_work, i915_error_work_func); -@@ -1899,7 +1899,7 @@ static void i915_driver_irq_preinstall(struct drm_device * dev) +@@ -1900,7 +1900,7 @@ static void i915_driver_irq_preinstall(struct drm_device * dev) drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; int pipe; @@ -27404,7 +27405,7 @@ index 9b1d669..d88e72c 100644 INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func); INIT_WORK(&dev_priv->error_work, i915_error_work_func); diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c -index 853bddb..6afec46 100644 +index fed87d6..f594763 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -1961,7 +1961,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y, @@ -27777,10 +27778,10 @@ index 59d72d0..3621b94 100644 /* * Asic structures diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c -index bf2b615..c821ec8 100644 +index 285acc4..f4d909f 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c -@@ -545,6 +545,8 @@ bool radeon_get_atom_connector_info_from_object_table(struct drm_device *dev) +@@ -569,6 +569,8 @@ bool radeon_get_atom_connector_info_from_object_table(struct drm_device *dev) struct radeon_gpio_rec gpio; struct radeon_hpd hpd; @@ -28157,7 +28158,7 @@ index e92298a..f68f2d6 100644 for (;;) { diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c -index 4f81d20..4b5f337 100644 +index 763797d..67a9f78 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1940,7 +1940,7 @@ static bool hid_ignore(struct hid_device *hdev) @@ -30609,7 +30610,7 @@ index 17cb6ab..f448b35 100644 r10_bio->devs[sl].addr + sect, diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c -index cbb50d3..6e20094 100644 +index 1f6c68d..c384765 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -550,7 +550,7 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s) @@ -34062,7 +34063,7 @@ index dd87e86..bc0148c 100644 } diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c -index dccd863..8d35669 100644 +index f8c752e..28bf4fc 100644 --- a/drivers/oprofile/oprof.c +++ b/drivers/oprofile/oprof.c @@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work) @@ -35444,10 +35445,10 @@ index 6888b2c..45befa1 100644 return errsts; memset(arr, 0, sizeof(arr)); diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c -index f97acff..0c53d1f 100644 +index 72ab1e6..ad69062 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c -@@ -1412,7 +1412,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q) +@@ -1414,7 +1414,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q) shost = sdev->host; scsi_init_cmd_errh(cmd); cmd->result = DID_NO_CONNECT << 16; @@ -35456,7 +35457,7 @@ index f97acff..0c53d1f 100644 /* * SCSI request completion path will do scsi_device_unbusy(), -@@ -1438,9 +1438,9 @@ static void scsi_softirq_done(struct request *rq) +@@ -1440,9 +1440,9 @@ static void scsi_softirq_done(struct request *rq) INIT_LIST_HEAD(&cmd->eh_entry); @@ -36155,10 +36156,10 @@ index 76d7485..ab8524a 100644 hcd->power_budget = 0; /* no limit */ diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c -index e42ce9d..b3ee231 100644 +index 5c4b5d9..fdfc7bf1 100644 --- a/drivers/staging/usbip/vhci_rx.c +++ b/drivers/staging/usbip/vhci_rx.c -@@ -76,7 +76,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev, +@@ -77,7 +77,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev, if (!urb) { pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum); pr_info("max seqnum %d\n", @@ -36393,7 +36394,7 @@ index 179063d..7baed53 100644 core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count); diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c -index 4b9b716..ec411b3 100644 +index 1340ffd..610981a 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c @@ -1681,7 +1681,7 @@ struct se_device *transport_add_device_to_core_hba( @@ -36435,7 +36436,7 @@ index 4b9b716..ec411b3 100644 T_TASK(cmd)->t_task_cdbs) atomic_set(&cmd->transport_sent, 1); -@@ -5568,7 +5568,7 @@ static void transport_generic_wait_for_tasks( +@@ -5573,7 +5573,7 @@ static void transport_generic_wait_for_tasks( atomic_set(&T_TASK(cmd)->transport_lun_stop, 0); } if (!atomic_read(&T_TASK(cmd)->t_transport_active) || @@ -36444,7 +36445,7 @@ index 4b9b716..ec411b3 100644 goto remove; atomic_set(&T_TASK(cmd)->t_transport_stop, 1); -@@ -5797,7 +5797,7 @@ int transport_check_aborted_status(struct se_cmd *cmd, int send_status) +@@ -5802,7 +5802,7 @@ int transport_check_aborted_status(struct se_cmd *cmd, int send_status) { int ret = 0; @@ -36453,7 +36454,7 @@ index 4b9b716..ec411b3 100644 if (!(send_status) || (cmd->se_cmd_flags & SCF_SENT_DELAYED_TAS)) return 1; -@@ -5825,7 +5825,7 @@ void transport_send_task_abort(struct se_cmd *cmd) +@@ -5830,7 +5830,7 @@ void transport_send_task_abort(struct se_cmd *cmd) */ if (cmd->data_direction == DMA_TO_DEVICE) { if (CMD_TFO(cmd)->write_pending_status(cmd) != 0) { @@ -36462,7 +36463,7 @@ index 4b9b716..ec411b3 100644 smp_mb__after_atomic_inc(); cmd->scsi_status = SAM_STAT_TASK_ABORTED; transport_new_cmd_failure(cmd); -@@ -5949,7 +5949,7 @@ static void transport_processing_shutdown(struct se_device *dev) +@@ -5954,7 +5954,7 @@ static void transport_processing_shutdown(struct se_device *dev) CMD_TFO(cmd)->get_task_tag(cmd), T_TASK(cmd)->t_task_cdbs, atomic_read(&T_TASK(cmd)->t_task_cdbs_left), @@ -42334,10 +42335,10 @@ index 9a37a9b..35792b6 100644 /* * We'll have a dentry and an inode for diff --git a/fs/dcache.c b/fs/dcache.c -index fbdcbca..ab87fb6 100644 +index d2f8feb..f2a208a 100644 --- a/fs/dcache.c +++ b/fs/dcache.c -@@ -3089,7 +3089,7 @@ void __init vfs_caches_init(unsigned long mempages) +@@ -3106,7 +3106,7 @@ void __init vfs_caches_init(unsigned long mempages) mempages -= reserve; names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0, @@ -44973,7 +44974,7 @@ index b6cca47..ec782c3 100644 cuse_class = class_create(THIS_MODULE, "cuse"); if (IS_ERR(cuse_class)) diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c -index 5cb8614..6865b11 100644 +index 2aaf3ea..8e50863 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -1242,7 +1242,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos, @@ -45846,10 +45847,10 @@ index f7593c0..581e14f 100644 out: return len; diff --git a/fs/namespace.c b/fs/namespace.c -index 537dd96..672cd58 100644 +index edc1c4a..b208120 100644 --- a/fs/namespace.c +++ b/fs/namespace.c -@@ -1329,6 +1329,9 @@ static int do_umount(struct vfsmount *mnt, int flags) +@@ -1326,6 +1326,9 @@ static int do_umount(struct vfsmount *mnt, int flags) if (!(sb->s_flags & MS_RDONLY)) retval = do_remount_sb(sb, MS_RDONLY, NULL, 0); up_write(&sb->s_umount); @@ -45859,7 +45860,7 @@ index 537dd96..672cd58 100644 return retval; } -@@ -1348,6 +1351,9 @@ static int do_umount(struct vfsmount *mnt, int flags) +@@ -1345,6 +1348,9 @@ static int do_umount(struct vfsmount *mnt, int flags) br_write_unlock(vfsmount_lock); up_write(&namespace_sem); release_mounts(&umount_list); @@ -45869,7 +45870,7 @@ index 537dd96..672cd58 100644 return retval; } -@@ -2339,6 +2345,16 @@ long do_mount(char *dev_name, char *dir_name, char *type_page, +@@ -2336,6 +2342,16 @@ long do_mount(char *dev_name, char *dir_name, char *type_page, MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT | MS_STRICTATIME); @@ -45886,7 +45887,7 @@ index 537dd96..672cd58 100644 if (flags & MS_REMOUNT) retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags, data_page); -@@ -2353,6 +2369,9 @@ long do_mount(char *dev_name, char *dir_name, char *type_page, +@@ -2350,6 +2366,9 @@ long do_mount(char *dev_name, char *dir_name, char *type_page, dev_name, data_page); dput_out: path_put(&path); @@ -45896,7 +45897,7 @@ index 537dd96..672cd58 100644 return retval; } -@@ -2576,6 +2595,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root, +@@ -2573,6 +2592,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root, if (error) goto out2; @@ -47334,7 +47335,7 @@ index d245cb2..7e645bd 100644 return -EPERM; if (kcore_need_update) diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c -index ed257d1..dda1954 100644 +index a962827..2963d5b 100644 --- a/fs/proc/meminfo.c +++ b/fs/proc/meminfo.c @@ -29,6 +29,8 @@ static int meminfo_proc_show(struct seq_file *m, void *v) @@ -47346,7 +47347,7 @@ index ed257d1..dda1954 100644 /* * display in kilobytes. */ -@@ -157,7 +159,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v) +@@ -158,7 +160,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v) vmi.used >> 10, vmi.largest_chunk >> 10 #ifdef CONFIG_MEMORY_FAILURE @@ -47957,7 +47958,7 @@ index d33418f..f8e06bc 100644 return -EINVAL; diff --git a/fs/seq_file.c b/fs/seq_file.c -index 05d6b0e..ee96362 100644 +index dba43c3..a99fb63 100644 --- a/fs/seq_file.c +++ b/fs/seq_file.c @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, loff_t offset) @@ -48427,7 +48428,7 @@ index f5b697b..a8de28d 100644 if (!IS_ERR(s)) kfree(s); diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c -index e546a33..08583b8 100644 +index a175933..36cd8dd 100644 --- a/fs/xfs/xfs_bmap.c +++ b/fs/xfs/xfs_bmap.c @@ -253,7 +253,7 @@ xfs_bmap_validate_ret( @@ -59351,7 +59352,7 @@ index 5e6f427..953d4f8 100644 }; diff --git a/include/linux/fs.h b/include/linux/fs.h -index b5b9792..caf64ce 100644 +index 7b17db7..f586116 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -109,6 +109,11 @@ struct inodes_stat_t { @@ -64929,10 +64930,10 @@ index 9b22d03..6295b62 100644 prev->next = info->next; else diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c -index a9205e3..1c6f5c0 100644 +index 2043c08..ec81a69 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c -@@ -1391,7 +1391,7 @@ void hrtimer_peek_ahead_timers(void) +@@ -1393,7 +1393,7 @@ void hrtimer_peek_ahead_timers(void) local_irq_restore(flags); } @@ -64942,7 +64943,7 @@ index a9205e3..1c6f5c0 100644 hrtimer_peek_ahead_timers(); } diff --git a/kernel/jump_label.c b/kernel/jump_label.c -index a8ce450..5519bce 100644 +index e6f1f24..6c19597 100644 --- a/kernel/jump_label.c +++ b/kernel/jump_label.c @@ -55,7 +55,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop) @@ -64955,7 +64956,7 @@ index a8ce450..5519bce 100644 } static void jump_label_update(struct jump_label_key *key, int enable); -@@ -297,10 +299,12 @@ static void jump_label_invalidate_module_init(struct module *mod) +@@ -298,10 +300,12 @@ static void jump_label_invalidate_module_init(struct module *mod) struct jump_entry *iter_stop = iter_start + mod->num_jump_entries; struct jump_entry *iter; @@ -67850,7 +67851,7 @@ index 4e4932a..be244da 100644 (table->proc_handler == proc_dointvec_minmax) || (table->proc_handler == proc_dointvec_jiffies) || diff --git a/kernel/taskstats.c b/kernel/taskstats.c -index fc0f220..c3b11a1 100644 +index 8d597b1..6eab856 100644 --- a/kernel/taskstats.c +++ b/kernel/taskstats.c @@ -27,9 +27,12 @@ @@ -67893,7 +67894,7 @@ index d776062..fa8d186 100644 sys_tz = *tz; update_vsyscall_tz(); diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c -index ea5e1a9..8b8df07 100644 +index 8b70c76..923e9f5 100644 --- a/kernel/time/alarmtimer.c +++ b/kernel/time/alarmtimer.c @@ -693,7 +693,7 @@ static int __init alarmtimer_init(void) @@ -67906,7 +67907,7 @@ index ea5e1a9..8b8df07 100644 .clock_get = alarm_clock_get, .timer_create = alarm_timer_create, diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c -index c7218d1..5f4ecc6 100644 +index 7a90d02..6d8585a 100644 --- a/kernel/time/tick-broadcast.c +++ b/kernel/time/tick-broadcast.c @@ -115,7 +115,7 @@ int tick_device_uses_broadcast(struct clock_event_device *dev, int cpu) @@ -67919,7 +67920,7 @@ index c7218d1..5f4ecc6 100644 cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); tick_broadcast_clear_oneshot(cpu); diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c -index 342408c..18c3098 100644 +index 5f45831..a62c75e 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -14,6 +14,7 @@ @@ -67930,7 +67931,7 @@ index 342408c..18c3098 100644 #include <linux/syscore_ops.h> #include <linux/clocksource.h> #include <linux/jiffies.h> -@@ -361,6 +362,8 @@ int do_settimeofday(const struct timespec *tv) +@@ -365,6 +366,8 @@ int do_settimeofday(const struct timespec *tv) if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC) return -EINVAL; @@ -68180,10 +68181,10 @@ index 0731e81a..91f8a79 100644 struct dentry *d_tracer; diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c -index 3e2a7c9..665bb9a 100644 +index 2d04936..7d78f18 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c -@@ -1318,10 +1318,6 @@ static LIST_HEAD(ftrace_module_file_list); +@@ -1317,10 +1317,6 @@ static LIST_HEAD(ftrace_module_file_list); struct ftrace_module_file_ops { struct list_head list; struct module *mod; @@ -68194,7 +68195,7 @@ index 3e2a7c9..665bb9a 100644 }; static struct ftrace_module_file_ops * -@@ -1342,17 +1338,12 @@ trace_create_file_ops(struct module *mod) +@@ -1341,17 +1337,12 @@ trace_create_file_ops(struct module *mod) file_ops->mod = mod; @@ -68218,7 +68219,7 @@ index 3e2a7c9..665bb9a 100644 list_add(&file_ops->list, &ftrace_module_file_list); -@@ -1376,8 +1367,8 @@ static void trace_module_add_events(struct module *mod) +@@ -1375,8 +1366,8 @@ static void trace_module_add_events(struct module *mod) for_each_event(call, start, end) { __trace_add_event_call(*call, mod, @@ -68738,10 +68739,10 @@ index cc5acf9..fd56cc0 100644 /* if an huge pmd materialized from under us just retry later */ if (unlikely(pmd_trans_huge(*pmd))) diff --git a/mm/hugetlb.c b/mm/hugetlb.c -index bfcf153..1eff489 100644 +index 80936a1..c060d53 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c -@@ -2339,6 +2339,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -2340,6 +2340,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma, return 1; } @@ -68769,7 +68770,7 @@ index bfcf153..1eff489 100644 /* * Hugetlb_cow() should be called with page lock of the original hugepage held. */ -@@ -2440,6 +2461,11 @@ retry_avoidcopy: +@@ -2443,6 +2464,11 @@ retry_avoidcopy: make_huge_pte(vma, new_page, 1)); page_remove_rmap(old_page); hugepage_add_new_anon_rmap(new_page, vma, address); @@ -68781,7 +68782,7 @@ index bfcf153..1eff489 100644 /* Make the old page be freed below */ new_page = old_page; mmu_notifier_invalidate_range_end(mm, -@@ -2591,6 +2617,10 @@ retry: +@@ -2594,6 +2620,10 @@ retry: && (vma->vm_flags & VM_SHARED))); set_huge_pte_at(mm, address, ptep, new_pte); @@ -68792,7 +68793,7 @@ index bfcf153..1eff489 100644 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) { /* Optimization, do the COW without a second fault */ ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page); -@@ -2620,6 +2650,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -2623,6 +2653,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, static DEFINE_MUTEX(hugetlb_instantiation_mutex); struct hstate *h = hstate_vma(vma); @@ -68803,7 +68804,7 @@ index bfcf153..1eff489 100644 ptep = huge_pte_offset(mm, address); if (ptep) { entry = huge_ptep_get(ptep); -@@ -2631,6 +2665,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -2634,6 +2668,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, VM_FAULT_SET_HINDEX(h - hstates); } @@ -71473,7 +71474,7 @@ index 9edc897..955be3d 100644 new->vm_region = region; diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index 0f50cdb..df4b678 100644 +index 8439d2a..b5e8c8c 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -340,7 +340,7 @@ out: @@ -71544,11 +71545,11 @@ index 0f50cdb..df4b678 100644 } return 0; diff --git a/mm/percpu.c b/mm/percpu.c -index bf80e55..c7c3f9a 100644 +index 93b5a7c..28d642c 100644 --- a/mm/percpu.c +++ b/mm/percpu.c -@@ -121,7 +121,7 @@ static unsigned int pcpu_first_unit_cpu __read_mostly; - static unsigned int pcpu_last_unit_cpu __read_mostly; +@@ -121,7 +121,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly; + static unsigned int pcpu_high_unit_cpu __read_mostly; /* the address of the first chunk which starts with the kernel static area */ -void *pcpu_base_addr __read_mostly; @@ -72566,7 +72567,7 @@ index 88ea1bd..0f1dfdb 100644 mm->unmap_area = arch_unmap_area; } diff --git a/mm/vmalloc.c b/mm/vmalloc.c -index 65d5fd2..4f14696 100644 +index 43b44db..5361145 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end) @@ -72715,7 +72716,7 @@ index 65d5fd2..4f14696 100644 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST, start, end, node, gfp_mask, caller); -@@ -1686,6 +1748,7 @@ static void *__vmalloc_node(unsigned long size, unsigned long align, +@@ -1688,6 +1750,7 @@ static void *__vmalloc_node(unsigned long size, unsigned long align, gfp_mask, prot, node, caller); } @@ -72723,7 +72724,7 @@ index 65d5fd2..4f14696 100644 void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot) { return __vmalloc_node(size, 1, gfp_mask, prot, -1, -@@ -1709,6 +1772,7 @@ static inline void *__vmalloc_node_flags(unsigned long size, +@@ -1711,6 +1774,7 @@ static inline void *__vmalloc_node_flags(unsigned long size, * For tight control over page level allocator and protection flags * use __vmalloc() instead. */ @@ -72731,7 +72732,7 @@ index 65d5fd2..4f14696 100644 void *vmalloc(unsigned long size) { return __vmalloc_node_flags(size, -1, GFP_KERNEL | __GFP_HIGHMEM); -@@ -1725,6 +1789,7 @@ EXPORT_SYMBOL(vmalloc); +@@ -1727,6 +1791,7 @@ EXPORT_SYMBOL(vmalloc); * For tight control over page level allocator and protection flags * use __vmalloc() instead. */ @@ -72739,7 +72740,7 @@ index 65d5fd2..4f14696 100644 void *vzalloc(unsigned long size) { return __vmalloc_node_flags(size, -1, -@@ -1739,6 +1804,7 @@ EXPORT_SYMBOL(vzalloc); +@@ -1741,6 +1806,7 @@ EXPORT_SYMBOL(vzalloc); * The resulting memory area is zeroed so it can be mapped to userspace * without leaking data. */ @@ -72747,7 +72748,7 @@ index 65d5fd2..4f14696 100644 void *vmalloc_user(unsigned long size) { struct vm_struct *area; -@@ -1766,6 +1832,7 @@ EXPORT_SYMBOL(vmalloc_user); +@@ -1768,6 +1834,7 @@ EXPORT_SYMBOL(vmalloc_user); * For tight control over page level allocator and protection flags * use __vmalloc() instead. */ @@ -72755,7 +72756,7 @@ index 65d5fd2..4f14696 100644 void *vmalloc_node(unsigned long size, int node) { return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL, -@@ -1785,6 +1852,7 @@ EXPORT_SYMBOL(vmalloc_node); +@@ -1787,6 +1854,7 @@ EXPORT_SYMBOL(vmalloc_node); * For tight control over page level allocator and protection flags * use __vmalloc_node() instead. */ @@ -72763,7 +72764,7 @@ index 65d5fd2..4f14696 100644 void *vzalloc_node(unsigned long size, int node) { return __vmalloc_node_flags(size, node, -@@ -1807,10 +1875,10 @@ EXPORT_SYMBOL(vzalloc_node); +@@ -1809,10 +1877,10 @@ EXPORT_SYMBOL(vzalloc_node); * For tight control over page level allocator and protection flags * use __vmalloc() instead. */ @@ -72776,7 +72777,7 @@ index 65d5fd2..4f14696 100644 -1, __builtin_return_address(0)); } -@@ -1829,6 +1897,7 @@ void *vmalloc_exec(unsigned long size) +@@ -1831,6 +1899,7 @@ void *vmalloc_exec(unsigned long size) * Allocate enough 32bit PA addressable pages to cover @size from the * page level allocator and map them into contiguous kernel virtual space. */ @@ -72784,7 +72785,7 @@ index 65d5fd2..4f14696 100644 void *vmalloc_32(unsigned long size) { return __vmalloc_node(size, 1, GFP_VMALLOC32, PAGE_KERNEL, -@@ -1843,6 +1912,7 @@ EXPORT_SYMBOL(vmalloc_32); +@@ -1845,6 +1914,7 @@ EXPORT_SYMBOL(vmalloc_32); * The resulting memory area is 32bit addressable and zeroed so it can be * mapped to userspace without leaking data. */ @@ -72792,7 +72793,7 @@ index 65d5fd2..4f14696 100644 void *vmalloc_32_user(unsigned long size) { struct vm_struct *area; -@@ -2105,6 +2175,8 @@ int remap_vmalloc_range(struct vm_area_struct *vma, void *addr, +@@ -2107,6 +2177,8 @@ int remap_vmalloc_range(struct vm_area_struct *vma, void *addr, unsigned long uaddr = vma->vm_start; unsigned long usize = vma->vm_end - vma->vm_start; @@ -78679,7 +78680,7 @@ index c94c051..be0abd1 100644 chip->pci = pci; chip->irq = -1; diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c -index 59abd84..74a3744 100644 +index 493ae7c..c0f5892 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1021,7 +1021,7 @@ static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream) @@ -78691,7 +78692,7 @@ index 59abd84..74a3744 100644 .open = soc_pcm_open, .close = soc_codec_close, .hw_params = soc_pcm_hw_params, -@@ -2128,6 +2128,7 @@ static int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) +@@ -2129,6 +2129,7 @@ static int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) rtd->pcm = pcm; pcm->private_data = rtd; if (platform->driver->ops) { diff --git a/main/linux-grsec/linux-3.0.x-regression-with-ipv4-routes-having-mtu.patch b/main/linux-grsec/linux-3.0.x-regression-with-ipv4-routes-having-mtu.patch new file mode 100644 index 0000000000..7ca4147826 --- /dev/null +++ b/main/linux-grsec/linux-3.0.x-regression-with-ipv4-routes-having-mtu.patch @@ -0,0 +1,53 @@ +diff --git a/net/ipv4/route.c b/net/ipv4/route.c +index f30112f..26a6249 100644 +--- a/net/ipv4/route.c ++++ b/net/ipv4/route.c +@@ -1841,6 +1841,22 @@ static unsigned int ipv4_mtu(const struct dst_entry *dst) + return mtu; + } + ++static void __rt_init_metrics(struct rtable *rt, struct fib_info *fi, ++ struct inet_peer *peer) ++{ ++ if (peer && fi->fib_metrics == (u32 *) dst_default_metrics) { ++ dst_init_metrics(&rt->dst, peer->metrics, false); ++ return; ++ } ++ ++ if (fi->fib_metrics != (u32 *) dst_default_metrics) { ++ rt->fi = fi; ++ atomic_inc(&fi->fib_clntref); ++ } ++ ++ dst_init_metrics(&rt->dst, fi->fib_metrics, true); ++} ++ + static void rt_init_metrics(struct rtable *rt, const struct flowi4 *fl4, + struct fib_info *fi) + { +@@ -1859,7 +1875,8 @@ static void rt_init_metrics(struct rtable *rt, const struct flowi4 *fl4, + if (inet_metrics_new(peer)) + memcpy(peer->metrics, fi->fib_metrics, + sizeof(u32) * RTAX_MAX); +- dst_init_metrics(&rt->dst, peer->metrics, false); ++ ++ __rt_init_metrics(rt, fi, peer); + + check_peer_pmtu(&rt->dst, peer); + if (peer->redirect_genid != redirect_genid) +@@ -1869,13 +1886,8 @@ static void rt_init_metrics(struct rtable *rt, const struct flowi4 *fl4, + rt->rt_gateway = peer->redirect_learned.a4; + rt->rt_flags |= RTCF_REDIRECTED; + } +- } else { +- if (fi->fib_metrics != (u32 *) dst_default_metrics) { +- rt->fi = fi; +- atomic_inc(&fi->fib_clntref); +- } +- dst_init_metrics(&rt->dst, fi->fib_metrics, true); +- } ++ } else ++ __rt_init_metrics(rt, fi, NULL); + } + + static void rt_set_nexthop(struct rtable *rt, const struct flowi4 *fl4, diff --git a/main/linux-grsec/net-flow-remove-sleeping-and-deferral-mechanism-from-flow_cache_flush.patch b/main/linux-grsec/net-flow-remove-sleeping-and-deferral-mechanism-from-flow_cache_flush.patch new file mode 100644 index 0000000000..8eaadf9429 --- /dev/null +++ b/main/linux-grsec/net-flow-remove-sleeping-and-deferral-mechanism-from-flow_cache_flush.patch @@ -0,0 +1,85 @@ +Based on http://patchwork.ozlabs.org/patch/132353/ + +diff --git a/net/core/flow.c b/net/core/flow.c +index 8ae42de..e318c7e 100644 +--- a/net/core/flow.c ++++ b/net/core/flow.c +@@ -358,6 +358,18 @@ void flow_cache_flush(void) + put_online_cpus(); + } + ++static void flow_cache_flush_task(struct work_struct *work) ++{ ++ flow_cache_flush(); ++} ++ ++static DECLARE_WORK(flow_cache_flush_work, flow_cache_flush_task); ++ ++void flow_cache_flush_deferred(void) ++{ ++ schedule_work(&flow_cache_flush_work); ++} ++ + static int __cpuinit flow_cache_cpu_prepare(struct flow_cache *fc, int cpu) + { + struct flow_cache_percpu *fcp = per_cpu_ptr(fc->percpu, cpu); +diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c +index 2118d64..9049a5c 100644 +--- a/net/xfrm/xfrm_policy.c ++++ b/net/xfrm/xfrm_policy.c +@@ -2276,8 +2276,6 @@ static void __xfrm_garbage_collect(struct net *net) + { + struct dst_entry *head, *next; + +- flow_cache_flush(); +- + spin_lock_bh(&xfrm_policy_sk_bundle_lock); + head = xfrm_policy_sk_bundles; + xfrm_policy_sk_bundles = NULL; +@@ -2290,6 +2288,18 @@ static void __xfrm_garbage_collect(struct net *net) + } + } + ++static void xfrm_garbage_collect(struct net *net) ++{ ++ flow_cache_flush(); ++ __xfrm_garbage_collect(net); ++} ++ ++static void xfrm_garbage_collect_deferred(struct net *net) ++{ ++ flow_cache_flush_deferred(); ++ __xfrm_garbage_collect(net); ++} ++ + static void xfrm_init_pmtu(struct dst_entry *dst) + { + do { +@@ -2422,7 +2432,7 @@ int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo) + if (likely(dst_ops->neigh_lookup == NULL)) + dst_ops->neigh_lookup = xfrm_neigh_lookup; + if (likely(afinfo->garbage_collect == NULL)) +- afinfo->garbage_collect = __xfrm_garbage_collect; ++ afinfo->garbage_collect = xfrm_garbage_collect_deferred; + xfrm_policy_afinfo[afinfo->family] = afinfo; + } + write_unlock_bh(&xfrm_policy_afinfo_lock); +@@ -2516,7 +2526,7 @@ static int xfrm_dev_event(struct notifier_block *this, unsigned long event, void + + switch (event) { + case NETDEV_DOWN: +- __xfrm_garbage_collect(dev_net(dev)); ++ xfrm_garbage_collect(dev_net(dev)); + } + return NOTIFY_DONE; + } +--- ./include/net/flow.h.orig ++++ ./include/net/flow.h +@@ -207,6 +207,7 @@ + u8 dir, flow_resolve_t resolver, void *ctx); + + extern void flow_cache_flush(void); ++extern void flow_cache_flush_deferred(void); + extern atomic_unchecked_t flow_cache_genid; + + #endif diff --git a/main/linux-grsec/x86-centaur-enable-cx8-for-via-eden-too.patch b/main/linux-grsec/x86-centaur-enable-cx8-for-via-eden-too.patch new file mode 100644 index 0000000000..37e3e3bdb0 --- /dev/null +++ b/main/linux-grsec/x86-centaur-enable-cx8-for-via-eden-too.patch @@ -0,0 +1,38 @@ +From: Timo Teräs <timo.teras@iki.fi> +Date: Thu, 15 Dec 2011 15:11:28 +0000 (+0200) +Subject: x86, centaur: Enable cx8 for VIA Eden too +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftip%2Ftip.git;a=commitdiff_plain;h=cb3f718de8301a969f8169d7d4160e73baff0b86 + +x86, centaur: Enable cx8 for VIA Eden too + +My box with following cpuinfo needs the cx8 enabling still: + +vendor_id : CentaurHauls +cpu family : 6 +model : 13 +model name : VIA Eden Processor 1200MHz +stepping : 0 +cpu MHz : 1199.940 +cache size : 128 KB + +This fixes valgrind to work on my box (it requires and checks +cx8 from cpuinfo). + +Signed-off-by: Timo Teräs <timo.teras@iki.fi> +Link: http://lkml.kernel.org/r/1323961888-10223-1-git-send-email-timo.teras@iki.fi +Signed-off-by: H. Peter Anvin <hpa@zytor.com> +--- + +diff --git a/arch/x86/kernel/cpu/centaur.c b/arch/x86/kernel/cpu/centaur.c +index e58d978..159103c 100644 +--- a/arch/x86/kernel/cpu/centaur.c ++++ b/arch/x86/kernel/cpu/centaur.c +@@ -278,7 +278,7 @@ static void __cpuinit init_c3(struct cpuinfo_x86 *c) + } + #ifdef CONFIG_X86_32 + /* Cyrix III family needs CX8 & PGE explicitly enabled. */ +- if (c->x86_model >= 6 && c->x86_model <= 9) { ++ if (c->x86_model >= 6 && c->x86_model <= 13) { + rdmsr(MSR_VIA_FCR, lo, hi); + lo |= (1<<1 | 1<<7); + wrmsr(MSR_VIA_FCR, lo, hi); diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD index e8ca6fb1da..a4d74c54d0 100644 --- a/main/linux-vserver/APKBUILD +++ b/main/linux-vserver/APKBUILD @@ -2,8 +2,8 @@ _flavor=vserver pkgname=linux-${_flavor} -pkgver=3.0.10 -pkgrel=1 +pkgver=3.0.14 +pkgrel=0 _vsver=vs2.3.2.1 if [ "${pkgver##*.*.*}" = "$pkgver" ]; then @@ -21,7 +21,7 @@ _config=${config:-kernelconfig.${CARCH}} install= source="http://www.kernel.org/pub/linux/kernel/v3.0/linux-$_kernver.tar.bz2 http://www.kernel.org/pub/linux/kernel/v3.0/patch-$pkgver.bz2 - patch-3.0.10-vs2.3.2.1-unofficial.diff + patch-$pkgver-${_vsver}-unofficial.diff kernelconfig.x86 kernelconfig.x86_64 " @@ -132,7 +132,7 @@ dev() { } md5sums="398e95866794def22b12dfbc15ce89c0 linux-3.0.tar.bz2 -8e0391dd935d838ee3023ab9daa6b447 patch-3.0.10.bz2 -6d2fd60b055272429dde5e4043280fcb patch-3.0.10-vs2.3.2.1-unofficial.diff +f2745bd4dcb3267414713adff403b54c patch-3.0.14.bz2 +7d49344644c0860707b9358bbb39768e patch-3.0.14-vs2.3.2.1-unofficial.diff 4baec73eeb0ddc1148d580a6d1e29b1f kernelconfig.x86 148b84ad28167290f2f7f0420945cb92 kernelconfig.x86_64" diff --git a/main/linux-vserver/patch-3.0.10-vs2.3.2.1-unofficial.diff b/main/linux-vserver/patch-3.0.14-vs2.3.2.1-unofficial.diff index 2c09d43edf..337cd011ef 100644 --- a/main/linux-vserver/patch-3.0.10-vs2.3.2.1-unofficial.diff +++ b/main/linux-vserver/patch-3.0.14-vs2.3.2.1-unofficial.diff @@ -162,7 +162,7 @@ diff -NurpP --minimal linux-3.0.9/Makefile linux-3.0.9-vs2.3.2.1/Makefile @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 0 - SUBLEVEL = 10 + SUBLEVEL = 14 -EXTRAVERSION = +EXTRAVERSION = -vs2.3.2.1 NAME = Sneaky Weasel @@ -3519,17 +3519,17 @@ diff -NurpP --minimal linux-3.0.9/fs/ext4/super.c linux-3.0.9-vs2.3.2.1/fs/ext4/ --- linux-3.0.9/fs/ext4/super.c 2011-11-15 16:40:46.000000000 +0100 +++ linux-3.0.9-vs2.3.2.1/fs/ext4/super.c 2011-08-31 19:37:44.000000000 +0200 @@ -1293,6 +1293,7 @@ enum { + Opt_inode_readahead_blks, Opt_journal_ioprio, Opt_dioread_nolock, Opt_dioread_lock, - Opt_discard, Opt_nodiscard, - Opt_init_inode_table, Opt_noinit_inode_table, + Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable, + Opt_tag, Opt_notag, Opt_tagid }; static const match_table_t tokens = { @@ -1368,6 +1369,9 @@ static const match_table_t tokens = { - {Opt_init_inode_table, "init_itable=%u"}, - {Opt_init_inode_table, "init_itable"}, - {Opt_noinit_inode_table, "noinit_itable"}, + {Opt_init_itable, "init_itable=%u"}, + {Opt_init_itable, "init_itable"}, + {Opt_noinit_itable, "noinit_itable"}, + {Opt_tag, "tag"}, + {Opt_notag, "notag"}, + {Opt_tagid, "tagid=%u"}, diff --git a/main/live-media/APKBUILD b/main/live-media/APKBUILD index e1038f9bbf..c554ebece0 100644 --- a/main/live-media/APKBUILD +++ b/main/live-media/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=live-media -pkgver=2011.10.27 +pkgver=2011.12.20 pkgrel=0 pkgdesc="A set of C++ libraries for multimedia streaming" url="http://live555.com/liveMedia" @@ -15,7 +15,7 @@ _builddir="$srcdir"/live prepare() { cd "$_builddir" - sed -e "/^COMPILE_OPTS/s/$/ $CFLAGS -fPIC -DPIC/" \ + sed -e "/^COMPILE_OPTS/s/$/ $CFLAGS -fPIC -DPIC -DXLOCALE_NOT_USED=1/" \ -e 's/\(LIBRARY_LINK =\).*/\1 $(LD) -o/g' \ -e 's/\(LIBRARY_LINK_OPTS =\).*/\1 $(LINK_OPTS) -r -Bstatic/g' \ -i config.linux @@ -44,4 +44,4 @@ package() { done } -md5sums="fe776efc25fbb98c6279b97cb9c48006 live.2011.10.27.tar.gz" +md5sums="1bcbd2e45149c0d918c63df8f6d7d0e0 live.2011.12.20.tar.gz" diff --git a/main/man-pages/APKBUILD b/main/man-pages/APKBUILD index 106b0a6799..14c71e46cf 100644 --- a/main/man-pages/APKBUILD +++ b/main/man-pages/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=man-pages -pkgver=3.32 +pkgver=3.35 _posixver=2003-a -pkgrel=2 +pkgrel=0 pkgdesc="Linux man pages" url="http://www.kernel.org/doc/man-pages/" arch="noarch" @@ -10,7 +10,7 @@ license="GPL" depends= makedepends="" options="!strip" -source="http://www.kernel.org/pub/linux/docs/$pkgname/$pkgname-$pkgver.tar.gz +source="http://man7.org/linux/download/man-pages/man-pages-$pkgver.tar.gz http://www.kernel.org/pub/linux/docs/$pkgname/$pkgname-posix/$pkgname-posix-${_posixver}.tar.bz2" build() { @@ -31,5 +31,5 @@ package() { rm "$pkgdir"/usr/share/man/man3/iconv* } -md5sums="cc6c2d4d4eb364fd8da718c412db09d4 man-pages-3.32.tar.gz +md5sums="e41432ee35a49036bbaf8d4598506e9c man-pages-3.35.tar.gz 7c78aff03c0a6767ba483d34f19e4b09 man-pages-posix-2003-a.tar.bz2" diff --git a/main/mc/APKBUILD b/main/mc/APKBUILD index 5a3b2e4a4c..b68fb8b209 100644 --- a/main/mc/APKBUILD +++ b/main/mc/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mc -pkgver=4.8.0 +pkgver=4.8.1 pkgrel=0 pkgdesc="A filemanager/shell that emulates Norton Commander" url="http://www.ibiblio.org/mc/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="592478c3edfa2ad64c8cd165b9bec446 mc-4.8.0.tar.bz2" +md5sums="7d60c87d87b359831d976fa28034935e mc-4.8.1.tar.bz2" diff --git a/main/midori/APKBUILD b/main/midori/APKBUILD index dd5a8ecf9e..67ad24f8f2 100644 --- a/main/midori/APKBUILD +++ b/main/midori/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=midori -pkgver=0.4.2 -pkgrel=1 +pkgver=0.4.3 +pkgrel=0 pkgdesc="A lightweight web browser based on Gtk WebKit" url="http://www.twotoasts.de/index.php?/pages/midori_summary.html" arch="all" @@ -48,4 +48,4 @@ package() { # PAX does not like the JIT paxctl -c -m -p "$pkgdir"/usr/bin/midori } -md5sums="4ec9c3daa332ebe865cba6aa8256ef63 midori-0.4.2.tar.bz2" +md5sums="900037557b82818d79d2dd1c5a7d7fd2 midori-0.4.3.tar.bz2" diff --git a/main/mplayer/APKBUILD b/main/mplayer/APKBUILD index a6c2966722..ce8b1a1fac 100644 --- a/main/mplayer/APKBUILD +++ b/main/mplayer/APKBUILD @@ -2,7 +2,7 @@ pkgname=mplayer pkgver=1.0_rc4 _ver=${pkgver%_*}${pkgver#*_} -pkgrel=6 +pkgrel=7 pkgdesc="A movie player for linux" url="http://www.mplayerhq.hu/" arch="all" @@ -17,6 +17,7 @@ makedepends="libxxf86dga-dev libxv-dev libmad-dev lame-dev libao-dev source="http://www.mplayerhq.hu/MPlayer/releases/MPlayer-$_ver.tar.bz2 mplayer-gcc-4.6-audio-fix.patch mplayer-libpng-1.5.patch + x11-libs.patch " _builddir="$srcdir"/MPlayer-$_ver prepare() { @@ -77,4 +78,5 @@ package() { } md5sums="1699c94de39da9c4c5d34e8f58e418f0 MPlayer-1.0rc4.tar.bz2 5f261813c5dfa70ba2378c2535428e5d mplayer-gcc-4.6-audio-fix.patch -f3f3bae09f6cee684ced1dbc7d7ed23c mplayer-libpng-1.5.patch" +f3f3bae09f6cee684ced1dbc7d7ed23c mplayer-libpng-1.5.patch +01bcc935a6b429347e8e77e1a70bf2b2 x11-libs.patch" diff --git a/main/mplayer/x11-libs.patch b/main/mplayer/x11-libs.patch new file mode 100644 index 0000000000..4e6f8b5c17 --- /dev/null +++ b/main/mplayer/x11-libs.patch @@ -0,0 +1,10 @@ +--- ./configure.orig ++++ ./configure +@@ -4394,6 +4394,7 @@ + if test "$_x11" = yes ; then + def_x11='#define CONFIG_X11 1' + vomodules="x11 xover $vomodules" ++ libs_mplayer="$libs_mplayer -lX11 -lXext" + else + _x11=no + def_x11='#undef CONFIG_X11' diff --git a/main/ncdu/APKBUILD b/main/ncdu/APKBUILD new file mode 100644 index 0000000000..a00cbe0b67 --- /dev/null +++ b/main/ncdu/APKBUILD @@ -0,0 +1,33 @@ +# Contributor: Fabian Affolter <fabian@affolter-engineering.ch> +# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> +pkgname=ncdu +pkgver=1.7 +pkgrel=0 +pkgdesc="Text-based disk usage viewer" +url="http://dev.yorhel.nl/ncdu" +arch="all" +license="MIT" +depends="" +depends_dev="" +makedepends="ncurses-dev" +install="" +subpackages="$pkgname-doc" +source="http://dev.yorhel.nl/download/$pkgname-$pkgver.tar.gz" +_builddir="$srcdir"/$pkgname-$pkgver + +build() { + cd "$_builddir" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 +} + +md5sums="172047c29d232724cc62e773e82e592a ncdu-1.7.tar.gz" diff --git a/main/nsd/APKBUILD b/main/nsd/APKBUILD index a110b94a8f..7261802245 100644 --- a/main/nsd/APKBUILD +++ b/main/nsd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Matt Smith <mcs@darkregion.net> # Maintainer: Matt Smith <mcs@darkregion.net> pkgname=nsd -pkgver=3.2.8 +pkgver=3.2.9 pkgrel=0 pkgdesc="NSD is an authoritative only, high performance, simple and open source name server." url="http://www.nlnetlabs.nl/projects/nsd/" @@ -69,7 +69,7 @@ doc() { "$subpkgdir"/usr/share/man || return 1 } -md5sums="963c2123853e7759ffb772da40c68838 nsd-3.2.8.tar.gz +md5sums="248a5fbce6cd3642ad7a75aaaab88931 nsd-3.2.9.tar.gz cc592572846b978a6f52130a8e518ab3 0010-stop-unlink-pid-error.patch 3aa94004a39319db89a329e9f24fb9da nsdc 4c0eef07caac9083aeeb9b15602d014d nsd.initd diff --git a/main/open-iscsi-grsec/APKBUILD b/main/open-iscsi-grsec/APKBUILD index 9d20e19a4d..c1c133f7d1 100644 --- a/main/open-iscsi-grsec/APKBUILD +++ b/main/open-iscsi-grsec/APKBUILD @@ -3,8 +3,8 @@ _flavor=grsec _realname=open-iscsi _realver=2.0-872 -_kver=3.0.12 -_kpkgrel=2 +_kver=3.0.14 +_kpkgrel=0 # verify the kernel version before entering chroot if [ -f ../linux-${_flavor}/APKBUILD ]; then @@ -56,4 +56,4 @@ package() { } md5sums="b4df94f08c241352bb964043b3e44779 open-iscsi-2.0-872.tar.gz -7fc6493815ac899da83db3197e25d0b9 Makefile-Alpine-kernels-support.patch" +05cd4034bf4fbb3b77ee800c6bdda3d3 Makefile-Alpine-kernels-support.patch" diff --git a/main/open-iscsi-grsec/Makefile-Alpine-kernels-support.patch b/main/open-iscsi-grsec/Makefile-Alpine-kernels-support.patch index 8308ba5907..7d48db534c 100644 --- a/main/open-iscsi-grsec/Makefile-Alpine-kernels-support.patch +++ b/main/open-iscsi-grsec/Makefile-Alpine-kernels-support.patch @@ -26,7 +26,7 @@ linux_2_6_35: $(unpatch_code) + -+linux_3_0_12: $(unpatch_code) ++linux_3_0_14: $(unpatch_code) do_unpatch_code: echo "Un-patching source code for use with linux-2.6.14 and up ..." diff --git a/main/open-vm-tools-grsec/APKBUILD b/main/open-vm-tools-grsec/APKBUILD index a169d5c29f..245b00573e 100644 --- a/main/open-vm-tools-grsec/APKBUILD +++ b/main/open-vm-tools-grsec/APKBUILD @@ -2,13 +2,13 @@ _flavor=grsec _realname=open-vm-tools -_mypkgrel=1 +_mypkgrel=0 _realver=2011.11.20 _realsubver=535097 -_kver=3.0.12 -_kpkgrel=2 +_kver=3.0.14 +_kpkgrel=0 # source open-vm-tools version if [ -f ../main/$_realname/APKBUILD ]; then diff --git a/main/open-vm-tools-vserver/APKBUILD b/main/open-vm-tools-vserver/APKBUILD index f0367ea0af..16d8e2885d 100644 --- a/main/open-vm-tools-vserver/APKBUILD +++ b/main/open-vm-tools-vserver/APKBUILD @@ -3,10 +3,10 @@ _flavor=vserver _realname=open-vm-tools _name=$_realname-$_flavor -_kver=3.0.10 -_kpkgrel=1 +_kver=3.0.14 +_kpkgrel=0 _myvsver=vs2.3.2.1 -_mypkgrel=1 +_mypkgrel=0 _realver=2011.11.20 _realsubver=535097 diff --git a/main/openldap/APKBUILD b/main/openldap/APKBUILD index 6a1ac2f8c8..6f84d48a9b 100644 --- a/main/openldap/APKBUILD +++ b/main/openldap/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=openldap -pkgver=2.4.26 -pkgrel=4 +pkgver=2.4.28 +pkgrel=0 pkgdesc="LDAP Server" url="http://www.openldap.org/" arch="all" @@ -17,7 +17,6 @@ install="$pkgname.pre-install $pkgname.post-install" source="ftp://ftp.$pkgname.org/pub/OpenLDAP/$pkgname-release/$pkgname-$pkgver.tgz openldap-2.4-ppolicy.patch openldap-2.4.11-libldap_r.patch - cve-2011-4079.patch slapd.initd slapd.confd slurpd.initd @@ -112,10 +111,9 @@ meta() { _backend meta; } monitor() { _backend monitor; } -md5sums="f36f3086031dd56ae94f722ffae8df5e openldap-2.4.26.tgz +md5sums="196023e552eeb259e048edcd61a9645b openldap-2.4.28.tgz 2524e490ba334a760fa57057c16da7a9 openldap-2.4-ppolicy.patch d19d0502f046078ecd737e29e7552fa8 openldap-2.4.11-libldap_r.patch -967d86fbfdbf9054b722f23323751fc9 cve-2011-4079.patch a729bf553d12b4a9fbda0ff5202a0443 slapd.initd b672311fca605c398240cd37a2ae080a slapd.confd fa5ce0005ef5f1160b6ff126f97aaa1a slurpd.initd" diff --git a/main/openldap/cve-2011-4079.patch b/main/openldap/cve-2011-4079.patch deleted file mode 100644 index 94a453d9c6..0000000000 --- a/main/openldap/cve-2011-4079.patch +++ /dev/null @@ -1,55 +0,0 @@ -one-byte buffer overflow in slapd - -Resolves: #749324 (CVE-2011-4079) -Upstream ITS: #7059 -Upstream commits: d0dd861 5072387 -Author: Howard Chu <hyc@openldap.org> - -diff -u ---- a/servers/slapd/schema_init.c -+++ b/servers/slapd/schema_init.c -@@ -1852,12 +1852,12 @@ UTF8StringNormalize( - } - nvalue.bv_val[nvalue.bv_len] = '\0'; - -- } else { -+ } else if ( tmp.bv_len ) { - /* string of all spaces is treated as one space */ - nvalue.bv_val[0] = ' '; - nvalue.bv_val[1] = '\0'; - nvalue.bv_len = 1; -- } -+ } /* should never be entered with 0-length val */ - - *normalized = nvalue; - return LDAP_SUCCESS; -@@ -2331,13 +2331,18 @@ postalAddressNormalize( - } - lines[l].bv_len = &val->bv_val[c] - lines[l].bv_val; - -- normalized->bv_len = l; -+ normalized->bv_len = c = l; - -- for ( l = 0; !BER_BVISNULL( &lines[l] ); l++ ) { -+ for ( l = 0; l <= c; l++ ) { - /* NOTE: we directly normalize each line, - * without unescaping the values, since the special - * values '\24' ('$') and '\5C' ('\') are not affected - * by normalization */ -+ if ( !lines[l].bv_len ) { -+ nlines[l].bv_len = 0; -+ nlines[l].bv_val = NULL; -+ continue; -+ } - rc = UTF8StringNormalize( usage, NULL, xmr, &lines[l], &nlines[l], ctx ); - if ( rc != LDAP_SUCCESS ) { - rc = LDAP_INVALID_SYNTAX; -@@ -2350,7 +2355,7 @@ postalAddressNormalize( - normalized->bv_val = slap_sl_malloc( normalized->bv_len + 1, ctx ); - - p = normalized->bv_val; -- for ( l = 0; !BER_BVISNULL( &nlines[l] ); l++ ) { -+ for ( l = 0; l <= c ; l++ ) { - p = lutil_strbvcopy( p, &nlines[l] ); - *p++ = '$'; - } diff --git a/main/opennhrp/0001-config-really-fix-holding-time-to-apply-to-shortcut-.patch b/main/opennhrp/0001-config-really-fix-holding-time-to-apply-to-shortcut-.patch deleted file mode 100644 index da1e8ffefa..0000000000 --- a/main/opennhrp/0001-config-really-fix-holding-time-to-apply-to-shortcut-.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 3554acce7fec0ce6e7560444c5e3975affb78260 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Tue, 18 Oct 2011 10:56:16 -0400 -Subject: [PATCH] config: really fix holding-time to apply to shortcut-target - -commit 94d1a7d4884346a5ba830ac209e1b746d23ec0c1 was supposed to -fix it, but it didn't fix resetting of the peer variable properly. ---- - nhrp/opennhrp.c | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/nhrp/opennhrp.c b/nhrp/opennhrp.c -index f2ecd44..0ff34ea 100644 ---- a/nhrp/opennhrp.c -+++ b/nhrp/opennhrp.c -@@ -243,15 +243,16 @@ static int load_config(const char *config_file) - NEED_PEER(); - peer->flags |= NHRP_PEER_FLAG_CISCO; - } else if (strcmp(word, "holding-time") == 0) { -- peer = NULL; - read_word(in, &lineno, sizeof(word), word); - if (peer != NULL && -- peer->type == NHRP_PEER_TYPE_LOCAL_ADDR) -+ peer->type == NHRP_PEER_TYPE_LOCAL_ADDR) { - peer->holding_time = atoi(word); -- else if (iface != NULL) -+ } else if (iface != NULL) { - iface->holding_time = atoi(word); -- else -+ peer = NULL; -+ } else { - rc = 7; -+ } - } else if (strcmp(word, "cisco-authentication") == 0) { - struct nhrp_buffer *buf; - struct nhrp_cisco_authentication_extension *auth; --- -1.7.4.1 - diff --git a/main/opennhrp/APKBUILD b/main/opennhrp/APKBUILD index b2daec0530..9d371354db 100644 --- a/main/opennhrp/APKBUILD +++ b/main/opennhrp/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=opennhrp -pkgver=0.12.3 -pkgrel=1 +pkgver=0.13 +pkgrel=0 pkgdesc="NBMA Next Hop Resolution Protocol daemon" url="http://sourceforge.net/projects/opennhrp" arch="all" @@ -11,7 +11,6 @@ makedepends="c-ares-dev" subpackages="$pkgname-doc" source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 opennhrp-0.9.3-peer-up-bgp.patch - 0001-config-really-fix-holding-time-to-apply-to-shortcut-.patch $pkgname.initd $pkgname.confd " @@ -33,8 +32,7 @@ package() { install -Dm755 "$srcdir"/opennhrp.initd "$pkgdir"/etc/init.d/opennhrp install -Dm644 "$srcdir"/opennhrp.confd "$pkgdir"/etc/conf.d/opennhrp } -md5sums="4d0ec7c0282e181ecca4d78e52067da3 opennhrp-0.12.3.tar.bz2 +md5sums="1569a337c5c7dce2d8c117244e9c56a9 opennhrp-0.13.tar.bz2 f81539fc92800bb79668dda119a97d1d opennhrp-0.9.3-peer-up-bgp.patch -884c085eedace7eab4d65ae3a47c4bde 0001-config-really-fix-holding-time-to-apply-to-shortcut-.patch ae65f88ccf849ef882669a8b4f0c7fc0 opennhrp.initd 8eee86233728dc0d156bbfee6d98f338 opennhrp.confd" diff --git a/main/pcre/APKBUILD b/main/pcre/APKBUILD index ec97759799..caab863524 100644 --- a/main/pcre/APKBUILD +++ b/main/pcre/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pcre -pkgver=8.20 +pkgver=8.21 pkgrel=0 pkgdesc="Perl-compatible regular expression library" url="http://pcre.sourceforge.net" @@ -46,4 +46,4 @@ libpcrecpp() { mv "$pkgdir"/usr/lib/libpcrecpp.so* "$subpkgdir"/usr/lib/ } -md5sums="a1931c70e1273e3450d5036fe273d25c pcre-8.20.tar.bz2" +md5sums="0a7b592bea64b7aa7f4011fc7171a730 pcre-8.21.tar.bz2" diff --git a/main/perl-test-nowarnings/APKBUILD b/main/perl-test-nowarnings/APKBUILD index 42b124bcf5..8cd2cd7b9a 100644 --- a/main/perl-test-nowarnings/APKBUILD +++ b/main/perl-test-nowarnings/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=perl-test-nowarnings -pkgver=1.03 +pkgver=1.04 pkgrel=0 pkgdesc="Test::NoWarnings perl module" url="http://search.cpan.org/dist/Test-NoWarnings/" @@ -36,4 +36,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -md5sums="09d89f1eda863baf6253728a4efc4d48 Test-NoWarnings-1.03.tar.gz" +md5sums="682ed043f7d3e38f3dfd8745fd21c49a Test-NoWarnings-1.04.tar.gz" diff --git a/main/perl-try-tiny/APKBUILD b/main/perl-try-tiny/APKBUILD index 14e30fa9a1..b861d0913c 100644 --- a/main/perl-try-tiny/APKBUILD +++ b/main/perl-try-tiny/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=perl-try-tiny -pkgver=0.09 +pkgver=0.11 pkgrel=0 pkgdesc="Try::Tiny perl module" url="http://search.cpan.org/dist/Try-Tiny/" @@ -36,4 +36,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -md5sums="e526aa7d80cbc690c4a20925a592c13c Try-Tiny-0.09.tar.gz" +md5sums="4d2c8ff385ac3513edf4c042dd0eacbe Try-Tiny-0.11.tar.gz" diff --git a/main/polkit/APKBUILD b/main/polkit/APKBUILD index 155329ff2f..f6183ec1b8 100644 --- a/main/polkit/APKBUILD +++ b/main/polkit/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=polkit _pkgname=PolicyKit -pkgver=0.102 +pkgver=0.103 pkgrel=0 pkgdesc="Application development toolkit for controlling system-wide privileges" url="http://www.freedesktop.org/wiki/Software/PolicyKit" @@ -49,4 +49,4 @@ package() { "$pkgdir"/usr/lib/polkit*/extensions/*.la } -md5sums="a799b58f4e6ab334719dee031134c970 PolicyKit-0.102.tar.bz2" +md5sums="67f1b5d563f9c78a6c51342dafa0b020 PolicyKit-0.103.tar.bz2" diff --git a/main/psqlodbc/APKBUILD b/main/psqlodbc/APKBUILD index e637231bbf..e90b70824e 100644 --- a/main/psqlodbc/APKBUILD +++ b/main/psqlodbc/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=psqlodbc -pkgver=09.00.0300 +pkgver=09.00.0310 pkgrel=0 pkgdesc="PostgreSQL ODBC driver" url="http://www.postgresql.org" @@ -25,4 +25,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/*.la } -md5sums="9b4897ac9ba63265fb4e149c94db8632 psqlodbc-09.00.0300.tar.gz" +md5sums="78144d9ea6c40f0a0a0b92128e6b0e05 psqlodbc-09.00.0310.tar.gz" diff --git a/main/qt/APKBUILD b/main/qt/APKBUILD index 169b445d8f..951463e158 100644 --- a/main/qt/APKBUILD +++ b/main/qt/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qt -pkgver=4.7.4 -pkgrel=1 +pkgver=4.8.0 +pkgrel=0 pkgdesc="A cross-platform application and UI framework" url="http://qt.nokia.com/" arch="all" @@ -229,7 +229,7 @@ x11() { usr/lib/qt/plugins } -md5sums="ddf7d83f912cf1283aa066368464fa22 qt-everywhere-opensource-src-4.7.4.tar.gz +md5sums="e8a5fdbeba2927c948d9f477a6abe904 qt-everywhere-opensource-src-4.8.0.tar.gz a445c6917086d80f1cfc1e40cb6b0132 assistant.desktop d457f0a0ad68a3861c3cadefe3b42ded designer.desktop 668331d9798a0e2b94381efb7be4c513 linguist.desktop diff --git a/main/ristretto/APKBUILD b/main/ristretto/APKBUILD index 49047de71c..b310c5a3b7 100644 --- a/main/ristretto/APKBUILD +++ b/main/ristretto/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ristretto -pkgver=0.2.3 +pkgver=0.3.0 pkgrel=0 pkgdesc="Ristretto is a image viewer for Xfce" url="http://goodies.xfce.org/projects/applications/ristretto" @@ -36,4 +36,4 @@ package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="62924c8abf17a921262ea9987ff8f5db ristretto-0.2.3.tar.bz2" +md5sums="124c4e98f837e35c728b0ff1d9078b1a ristretto-0.3.0.tar.bz2" diff --git a/main/snort/APKBUILD b/main/snort/APKBUILD index e297e64d19..d041596ea0 100644 --- a/main/snort/APKBUILD +++ b/main/snort/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=snort -pkgver=2.9.1.2 +pkgver=2.9.2 pkgrel=0 pkgdesc="An open source network intrusion prevention and detection system" url="http://www.snort.org/" @@ -44,6 +44,6 @@ package() { install -D -m 644 ../snort.confd "$pkgdir"/etc/conf.d/snort } -md5sums="9e94f20b934566469c239966e1b41eba snort-2.9.1.2.tar.gz +md5sums="22fa07ba915535b151329056439ae194 snort-2.9.2.tar.gz ffda56f7c20f5cea1c37c971e0f1d6c9 snort.initd 446f8d2b3435b8a6be738da978670605 snort.confd" diff --git a/main/sox/APKBUILD b/main/sox/APKBUILD index f6c3e80828..d2cf7dacad 100644 --- a/main/sox/APKBUILD +++ b/main/sox/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sox pkgver=14.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="The Swiss Army knife of sound processing tools" url="http://sox.sourceforge.net/" arch="all" @@ -40,8 +40,9 @@ package() { ln -sf play "$pkgdir"/usr/bin/rec || return 1 ln -sf ../man1/sox.1.gz "$pkgdir"/usr/share/man/man7/soxeffect.7 || return 1 rm "$pkgdir"/usr/lib/*.la \ - "$pkgdir"/usr/lib/sox/*.a \ - "$pkgdir"/usr/lib/sox/*.la \ + "$pkgdir"/usr/lib/sox/*.a \ + "$pkgdir"/usr/lib/sox/*.la \ + || return 1 } md5sums="e9d35cf3b0f8878596e0b7c49f9e8302 sox-14.3.2.tar.gz d8267f718ba6b4fb2f48c5104af31364 sox-uclibc.patch diff --git a/main/syslinux/APKBUILD b/main/syslinux/APKBUILD index ba4b1e03d1..1f6884b4b4 100644 --- a/main/syslinux/APKBUILD +++ b/main/syslinux/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=syslinux -pkgver=4.04 -pkgrel=10 +pkgver=4.05 +pkgrel=0 pkgdesc="Boot loader for the Linux operating system" url="http://syslinux.org" arch="x86 x86_64" license="GPL" -makedepends="nasm perl" +makedepends="nasm perl util-linux-dev" depends="mtools blkid mkinitfs" triggers="syslinux.trigger=/boot" install="syslinux.post-upgrade" @@ -36,6 +36,6 @@ package() { cp "$srcdir"/update-extlinux "$pkgdir"/sbin/ } -md5sums="a3936208767eb7ced65320abe2e33a10 syslinux-4.04.tar.bz2 +md5sums="82299242418385da1274c9479a778cb2 syslinux-4.05.tar.bz2 7ef73a7a858b8aa1ac6635d6391ac8e5 update-extlinux.conf 2414de8196826e20292825d69c75184b update-extlinux" diff --git a/main/tinc/APKBUILD b/main/tinc/APKBUILD index f2bf612ae0..03194dc570 100644 --- a/main/tinc/APKBUILD +++ b/main/tinc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=tinc -pkgver=1.0.13 -pkgrel=1 +pkgver=1.0.16 +pkgrel=0 pkgdesc="tinc is a Virtual Private Network (VPN) daemon" url="http://www.tinc-vpn.org/" arch="all" @@ -45,7 +45,7 @@ package() { "$pkgdir"/etc/conf.d/tinc.networks } -md5sums="86263994d38c750431efd17e9a91a248 tinc-1.0.13.tar.gz +md5sums="f1c7ed94878725fb2cf4efb02bf160da tinc-1.0.16.tar.gz 89d104d38bab84d6f92d27464e48628d tincd.initd 96d8778284637fa7790a4c6239a72070 tincd.lo.initd 475d64d9aa410ec7e91f5b079800abc9 tinc.networks" diff --git a/main/udev/APKBUILD b/main/udev/APKBUILD index 591cede4a8..e75345d6ab 100644 --- a/main/udev/APKBUILD +++ b/main/udev/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=udev -pkgver=173 +pkgver=175 pkgrel=1 pkgdesc="The userspace dev tools (udev)" url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" @@ -34,6 +34,12 @@ package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install + # Upstream moved udevd to /lib/udev + ln -s "../lib/udev/udevd" "$pkgdir"/sbin/udevd + + # multipath-tools expect scsi_id in /sbin + ln -s "../lib/udev/scsi_id" "$pkgdir"/sbin/scsi_id + mkdir -p "$pkgdir"/usr/lib/pkgconfig chmod +x "$pkgdir"/lib/udev/write_*_rules for _i in write_root_link_rule; do @@ -66,7 +72,7 @@ libgudev() { "$subpkgdir"/usr/lib/ } -md5sums="91a88a359b60bbd074b024883cc0dbde udev-173.tar.bz2 +md5sums="2fc9c1efcbde98e3d73ffee7a77aea47 udev-175.tar.bz2 c9de7581099cdfdcd105666cd98a0f0a write_root_link_rule 884d7faaaa149a323b14e907ea1934f4 udev-mount.initd e99c87e62e7cb5acc4c55bf065944a11 udev-postmount.initd diff --git a/main/unbound/APKBUILD b/main/unbound/APKBUILD index 26af1d8c0a..3f9081a822 100644 --- a/main/unbound/APKBUILD +++ b/main/unbound/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=unbound -pkgver=1.4.13 -pkgrel=3 +pkgver=1.4.14 +pkgrel=0 pkgdesc="Unbound is a validating, recursive, and caching DNS resolver" pkgusers="unbound" pkggroups="unbound" @@ -82,7 +82,7 @@ py() { mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/ } -md5sums="7e3b27dee2b97640dd2e1783253317ab unbound-1.4.13.tar.gz +md5sums="cd69fdaaa6af01ea0b6fbc59802f74ba unbound-1.4.14.tar.gz 32fe2914a2723142d3eae9ea556872d3 conf.patch c1c71cd0e7f9630536a2abf2513c675d update-unbound-root-hints d7a1cb305b7b5b72df4e574777f76723 root.hints diff --git a/main/vlc/APKBUILD b/main/vlc/APKBUILD index 9c3615882d..50bdec6d5e 100644 --- a/main/vlc/APKBUILD +++ b/main/vlc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=vlc -pkgver=1.1.12 +pkgver=1.1.13 pkgrel=1 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" pkgusers="vlc" @@ -11,16 +11,17 @@ arch="all" license="GPL-2" triggers="$pkgname.trigger=/usr/lib/vlc/plugins" subpackages="$pkgname-dev $pkgname-doc $pkgname-xorg $pkgname-daemon" -#depends="libnotify a52dec fluidsynth zvbi libdvbpsi lirc-utils libdca hal -# libproxy sdl_image libdvdnav>=4.1.3 lua libxv libv4l libcddb smbclient -# libmatroska taglib sysfsutils libmpcdec ffmpeg>=0.5 libshout libmad -# qt fribidi libmpeg2 libmodplug avahi ttf-dejavu" +#depends="fluidsynth zvbi lirc-utils libdca +# libproxy libdvdnav>=4.1.3 libcddb smbclient +# libmatroska libmpcdec +# qt libmodplug ttf-dejavu" depends="ttf-dejavu" makedepends=" a52dec-dev alsa-lib-dev automake autoconf + avahi-dev libtool dbus-dev faad2-dev @@ -183,9 +184,9 @@ daemon() { install -d -o vlc -g vlc "$subpkgdir"/var/log/vlc } -md5sums="91de1ad308c947e35380f9d747ff5713 vlc-1.1.12.tar.bz2 +md5sums="9678fb7a04808b6e0de63746d35e4bb1 vlc-1.1.13.tar.bz2 ba24152286d98f8a367c7fd0cb8949f4 uclibc3.patch 402d28075ff672d4f273cf8b9b1b3137 uclibc-libcompat.patch -c40a7df07af3b68a109b4d6bf04155d2 uclibc-inhibit-spawn.patch +28349b8239fdd6987fbe0ca2c758517f uclibc-inhibit-spawn.patch ddbd40bd72fedc1449be45588aea5d66 vlc.trigger e1ef2dec8e25f7ea6ba40e646c63e061 vlc-1.1.7-disable-cache-gen.patch" diff --git a/main/vlc/uclibc-inhibit-spawn.patch b/main/vlc/uclibc-inhibit-spawn.patch index 75cff1bb6b..c34ebe0f7b 100644 --- a/main/vlc/uclibc-inhibit-spawn.patch +++ b/main/vlc/uclibc-inhibit-spawn.patch @@ -1,11 +1,11 @@ diff --git a/modules/misc/inhibit/xdg.c b/modules/misc/inhibit/xdg.c -index cfb3b2a..16a2ce9 100644 +index 3f297c6..e16a21e 100644 --- a/modules/misc/inhibit/xdg.c +++ b/modules/misc/inhibit/xdg.c -@@ -26,7 +26,11 @@ - #include <vlc_plugin.h> +@@ -27,7 +27,11 @@ #include <vlc_inhibit.h> #include <assert.h> + #include <signal.h> -#include <spawn.h> +#if !defined(_POSIX_SPAWN) +# define _POSIX_SPAWN -1 @@ -15,7 +15,7 @@ index cfb3b2a..16a2ce9 100644 #include <sys/wait.h> static int Open (vlc_object_t *); -@@ -46,7 +50,9 @@ struct vlc_inhibit_sys +@@ -47,7 +51,9 @@ struct vlc_inhibit_sys vlc_thread_t thread; vlc_cond_t update, inactive; vlc_mutex_t lock; @@ -25,13 +25,11 @@ index cfb3b2a..16a2ce9 100644 bool suspend, suspended; }; -@@ -66,17 +72,21 @@ static int Open (vlc_object_t *obj) +@@ -67,17 +73,19 @@ static int Open (vlc_object_t *obj) vlc_mutex_init (&p_sys->lock); vlc_cond_init (&p_sys->update); vlc_cond_init (&p_sys->inactive); -+#if (_POSIX_SPAWN >= 0) - posix_spawnattr_init (&p_sys->attr); -+#endif +- posix_spawnattr_init (&p_sys->attr); /* Reset signal handlers to default and clear mask in the child process */ { sigset_t set; @@ -40,6 +38,7 @@ index cfb3b2a..16a2ce9 100644 - posix_spawnattr_setsigmask (&p_sys->attr, &set); sigaddset (&set, SIGPIPE); +#if (_POSIX_SPAWN >= 0) ++ posix_spawnattr_init (&p_sys->attr); + posix_spawnattr_setsigmask (&p_sys->attr, &set); posix_spawnattr_setsigdefault (&p_sys->attr, &set); posix_spawnattr_setflags (&p_sys->attr, POSIX_SPAWN_SETSIGDEF @@ -48,7 +47,7 @@ index cfb3b2a..16a2ce9 100644 } p_sys->suspend = false; p_sys->suspended = false; -@@ -105,7 +115,9 @@ static void Close (vlc_object_t *obj) +@@ -106,7 +114,9 @@ static void Close (vlc_object_t *obj) vlc_cancel (p_sys->thread); vlc_join (p_sys->thread, NULL); @@ -58,7 +57,7 @@ index cfb3b2a..16a2ce9 100644 vlc_cond_destroy (&p_sys->inactive); vlc_cond_destroy (&p_sys->update); vlc_mutex_destroy (&p_sys->lock); -@@ -152,8 +164,16 @@ static void *Thread (void *data) +@@ -153,8 +163,16 @@ static void *Thread (void *data) pid_t pid; vlc_mutex_unlock (&p_sys->lock); diff --git a/main/vlc/vlc-daemon.pre-install b/main/vlc/vlc-daemon.pre-install index 45f66bff6b..17473498c9 100644 --- a/main/vlc/vlc-daemon.pre-install +++ b/main/vlc/vlc-daemon.pre-install @@ -1,5 +1,13 @@ #!/bin/sh -addgroup -S vlc 2>/dev/null -adduser -S -h /home/vlc -s /bin/sh -G vlc -G audio -G video -D vlc &>/dev/null +groups="vlc audio video" +for group in $groups do + addgroup -S $group 2>/dev/null +done +adduser -S -h /home/vlc -s /bin/sh -G vlc -D vlc 2>/dev/null + +# make sure vlc are in all groups +for group in $groups do + addgroup vlc $group 2>/dev/null +done exit 0 diff --git a/main/wine/APKBUILD b/main/wine/APKBUILD index 823900a9cf..0f64c8c18a 100644 --- a/main/wine/APKBUILD +++ b/main/wine/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=wine -pkgver=1.3.34 +pkgver=1.3.35 pkgrel=0 pkgdesc="A compatibility layer for running Windows programs" url="http://www.winehq.com" @@ -46,4 +46,4 @@ package() { "$pkgdir"/usr/bin/wine } -md5sums="ae7be1767e95e27360fc86f573649c19 wine-1.3.34.tar.bz2" +md5sums="5833787fcd7fee5a2299fade10a2760d wine-1.3.35.tar.bz2" diff --git a/main/wine_gecko/APKBUILD b/main/wine_gecko/APKBUILD new file mode 100644 index 0000000000..be9aa1ecf0 --- /dev/null +++ b/main/wine_gecko/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=wine_gecko +pkgver=1.4 +pkgrel=0 +pkgdesc="Wine's built-in replacement for Microsoft's Internet Explorer" +url="http://wiki.winehq.org/Gecko" +arch="x86" +license="MPL" +depends="" +makedepends="" +install="" +subpackages="" +source="http://downloads.sourceforge.net/wine/wine_gecko-$pkgver-$CARCH.msi" + +_builddir= +prepare() { + mkdir -p "$srcdir" +} + +build() { + return 0 +} + +package() { + mkdir -p "$pkgdir"/usr/share/wine/gecko/ + cp "$srcdir"/wine_gecko-$pkgver-$CARCH.msi \ + "$pkgdir"/usr/share/wine/gecko/ +} + +md5sums="700aaa08724be1992cffed7b87e79a44 wine_gecko-1.4-x86.msi" diff --git a/main/x264/APKBUILD b/main/x264/APKBUILD index 751e8b0690..4020c8f38e 100644 --- a/main/x264/APKBUILD +++ b/main/x264/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=x264 -pkgver=20111001 +pkgver=20111129 pkgrel=0 pkgdesc="free library for encoding H264/AVC video streams" url="http://www.videolan.org/developers/x264.html" @@ -25,4 +25,4 @@ package() { cd "$_builddir" make DESTDIR="$pkgdir" bindir=/usr/bin libdir=/usr/lib includedir=/usr/include install || return 1 } -md5sums="78a5a6fea4cafac6d9863b19bffc119f x264-snapshot-20111001-2245-stable.tar.bz2" +md5sums="7feed501de65e103e926fd64a0bba117 x264-snapshot-20111129-2245-stable.tar.bz2" diff --git a/main/xfwm4/APKBUILD b/main/xfwm4/APKBUILD index 257f59904f..6f7f1f0181 100644 --- a/main/xfwm4/APKBUILD +++ b/main/xfwm4/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfwm4 -pkgver=4.8.2 -pkgrel=1 +pkgver=4.8.3 +pkgrel=0 pkgdesc="Xfce window manager, compatible with Gnome, Gnome2, KDE2, and KDE3" url="http://www.xfce.org/" arch="all" @@ -29,4 +29,4 @@ package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="41b730d5abf39a69fc3b221728ddaa75 xfwm4-4.8.2.tar.bz2" +md5sums="66cb65797cea8a62563f69b833c7888b xfwm4-4.8.3.tar.bz2" diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD index 407608b30f..74fe79bd2c 100644 --- a/main/xorg-server/APKBUILD +++ b/main/xorg-server/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xorg-server -pkgver=1.11.2 +pkgver=1.11.3 pkgrel=0 pkgdesc="X.Org X servers" url="http://xorg.freedesktop.org" @@ -149,5 +149,5 @@ xephyr() { mv "$pkgdir"/usr/bin/Xephyr "$subpkgdir"/usr/bin/ } -md5sums="8796fff441e5435ee36a72579008af24 xorg-server-1.11.2.tar.bz2 +md5sums="a7194c437963627e1db0dd2d6c1a1984 xorg-server-1.11.3.tar.bz2 222de594206d1148a90eddfda4f7a11a xorg-redhat-die-ugly-pattern-die-die-die.patch" diff --git a/main/xtables-addons-grsec/APKBUILD b/main/xtables-addons-grsec/APKBUILD index 62dd7d0e32..a03e80b272 100644 --- a/main/xtables-addons-grsec/APKBUILD +++ b/main/xtables-addons-grsec/APKBUILD @@ -3,8 +3,8 @@ _flavor=${FLAVOR:-grsec} _realname=xtables-addons _name=$_realname-$_flavor -_kver=3.0.12 -_kpkgrel=2 +_kver=3.0.14 +_kpkgrel=0 # source the kernel version if [ -f ../linux-$_flavor/APKBUILD ]; then diff --git a/main/zeromq/APKBUILD b/main/zeromq/APKBUILD index 910ede50f9..b05ae2a0c7 100644 --- a/main/zeromq/APKBUILD +++ b/main/zeromq/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=zeromq -pkgver=2.1.10 +pkgver=2.1.11 pkgrel=0 pkgdesc="The ZeroMQ messaging library and tools" url="http://www.zeromq.org/" @@ -41,4 +41,4 @@ libzmq() { mv "$pkgdir"/usr/lib/libzmq.so.* "$subpkgdir"/usr/lib/ } -md5sums="f034096095fa76041166a8861e9d71b7 zeromq-2.1.10.tar.gz" +md5sums="f0f9fd62acb1f0869d7aa80379b1f6b7 zeromq-2.1.11.tar.gz" diff --git a/main/zsh/APKBUILD b/main/zsh/APKBUILD index f6acc28263..88a29ec08f 100644 --- a/main/zsh/APKBUILD +++ b/main/zsh/APKBUILD @@ -1,7 +1,7 @@ # Contributor: <kalonji@gmail.com> # Maintainer: <ncopa@alpinelinux.org> pkgname=zsh -pkgver=4.3.12 +pkgver=4.3.15 pkgrel=0 pkgdesc="A very advanced and programmable command interpreter (shell) for UNIX" url="http://www.zsh.org/" @@ -39,7 +39,7 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="46ae7be975779b9b0ea24e8b30479a8b zsh-4.3.12.tar.gz +md5sums="b2e2d0a431935b408ed8ea48226f9962 zsh-4.3.15.tar.gz aedff0460ef282937905223207ac702e zsh.post-install aedff0460ef282937905223207ac702e zsh.post-upgrade b48f79e2d4a29047f6152f5a9441f942 zsh.pre-deinstall" |