Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (040f92b2c115170ad72b7a4aa51c613bd7f92248)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (040f92b2c115170ad72b7a4aa51c613bd7f92248)
  • Date: Fri, 22 Mar 2013 13:57:02 -0500

GIT changes to devel-xorg-modular grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

crypto/openssh/DETAILS | 2
crypto/openssh/HISTORY | 3
database/sqlite/DETAILS | 8
database/sqlite/HISTORY | 3
devel/git/DETAILS | 8
devel/git/HISTORY | 3
devel/qt-creator/DETAILS | 8
devel/qt-creator/HISTORY | 3
disk/gparted/DETAILS | 4
disk/gparted/HISTORY | 3
doc/man-pages/DETAILS | 4
doc/man-pages/HISTORY | 3
ftp/ncdc/DETAILS | 2
ftp/ncdc/HISTORY | 3
graphics-libs/poppler/DETAILS | 8
graphics-libs/poppler/HISTORY | 3
graphics/xli/0001-add-missing-include.patch | 24 +
graphics/xli/BUILD | 2
graphics/xli/DETAILS | 13
graphics/xli/HISTORY | 5
graphics/xli/PRE_BUILD | 27 -
graphics/xli/fix-scale-zoom.patch | 61 --
graphics/xli/libpng14.patch | 14
graphics/xli/xli-security-gentoo.diff | 199 ---------
kernels/linux/HISTORY | 4
kernels/linux/info/patches/maintenance_patches_3/patch-3.8.4 | 5
kernels/linux/latest.defaults | 2
libs/glibc/DETAILS | 2
libs/glibc/HISTORY | 7
libs/glibc/PRE_BUILD | 7
libs/glibc/fix-res_query-assert.patch | 51 --
libs/glibc/glibc-2.17-sync-with-linux37.patch | 130 ++++++
libs/glibc/glibc.gpg |binary
libs/glibc/revert-c5a0802a.patch | 226
-----------
science/qlandkarte-gt/DETAILS | 4
science/qlandkarte-gt/HISTORY | 3
utils/file/DETAILS | 4
utils/file/HISTORY | 3
utils/powertop/DETAILS | 4
utils/powertop/HISTORY | 3
40 files changed, 267 insertions(+), 601 deletions(-)

New commits:
commit f2c6bb5a291b3dda43793c9ac3fdfa50b931120c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/qt-creator: version 2.7.0

commit 6778f353122b8cb61b84fb32ea961cef991a2cf8
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

gparted 0.15.0

commit 964ce71a534f91c32e8e77cca6ecad4fc94fdf72
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

poppler 0.22.2

commit bd521e75ec5c15a6842bdcad11e4c5ebd1dcd450
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

file 5.14

commit 3f3b99e065cb66b3da9bf13d70a3c8f634e0e955
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

openssh 6.2p1

commit cbd179b36503b13d776b21be172767f95d9fcf14
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ncdc: => 1.16

commit cc2699cfcb33f8f27b6818dcf5bec47186b8ecb2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

man-pages: => 3.50

commit 5b8be0dabaa813ab1569bb67e0c965164a98b00b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

sqlite: => 3.7.16

commit 4059764a7537c63b34c982331bf214ddcd629600
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

git 1.8.2

commit 287ae2e5079d858b8eaf4d7ff2541076b660eabe
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

linux 3.8.4

commit ffca9177615ae756b6259d8a4d5b3e38bfb59b97
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics/xli: version 1.17.0

commit 9866a42d1c297318595af52d2adbd5c16246de08
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

science/qlandkarte-gt: version 1.7.0

commit 6e3dcc129d71c617b217b753c94a76d78b0aca99
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/powertop: version 2.3

commit e6b2a9ff76f0b3ab99b5eb924f6d44f85f9c626f
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

glibc.gpg permission fixed

commit 5642173362cafc43bb904ff209c3c4930e5bd0aa
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

glibc 2.17

works like a charm for me
didn't fixed linux 3.7 cast problem

diff --git a/crypto/openssh/DETAILS b/crypto/openssh/DETAILS
index e32d4db..3385443 100755
--- a/crypto/openssh/DETAILS
+++ b/crypto/openssh/DETAILS
@@ -1,5 +1,5 @@
SPELL=openssh
- VERSION=6.1p1
+ VERSION=6.2p1
SECURITY_PATCH=6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
diff --git a/crypto/openssh/HISTORY b/crypto/openssh/HISTORY
index e16ebf4..11ba59d 100644
--- a/crypto/openssh/HISTORY
+++ b/crypto/openssh/HISTORY
@@ -1,3 +1,6 @@
+2013-03-22 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 6.2p1
+
2012-08-29 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 6.1p1

diff --git a/database/sqlite/DETAILS b/database/sqlite/DETAILS
index 233200b..5eced7a 100755
--- a/database/sqlite/DETAILS
+++ b/database/sqlite/DETAILS
@@ -1,10 +1,10 @@
SPELL=sqlite
- VERSION=3.7.15.2
- VERSIONX=autoconf-3071502
-
SOURCE_HASH=sha512:ccec842f649c1dd47aed4712fc775d41097daca895ccc8b7fee24771f6c1832fb5210473f62dc62d4391c0a47ed3dfc9b92046fa7937aeb859105680942da082
+ VERSION=3.7.16
+ VERSIONX=autoconf-3071600
+
SOURCE_HASH=sha512:5f63a1ce5d06e4e09c86bac5cf78091ff4444b1a79b05008443e6ef211512acc6bea258052a83cee290b42fe2dd395698526b0e2cade9bb9d09ae522245454e2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL}-${VERSIONX}"
SOURCE=${SPELL}-${VERSIONX}.tar.gz
- SOURCE_URL[0]=http://sqlite.org/$SOURCE
+ SOURCE_URL[0]=http://www.sqlite.org/2013/$SOURCE
LICENSE[0]=PD
WEB_SITE=http://www.sqlite.org/
ENTERED=20011016
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index 9ec3438..ee8f964 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,6 @@
+2013-03-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.7.16; renewed SOURCE_URL[0]
+
2013-01-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.7.15.2

diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index a3a11a9..799c41b 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,10 +1,10 @@
SPELL=git
- VERSION=1.8.1.3
+ VERSION=1.8.2
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
# SOURCE2=$SOURCE.sign
# SOURCE_GPG=kernel.gpg:$SOURCE.sign:UPSTREAM_KEY
-
SOURCE_HASH=sha512:52e4db6caecd403da7af1b7b59cf14a4b86de23d61e592a7410c9ecd3b62c28288d40d8f76744a20b1e3b7ddc9d7ca3799b05801055a21a98ce070f5987b70c1
+
SOURCE_HASH=sha512:08274649a525879e2e5a6940cfd6e8b48c30e551ca1b63c7c73198a4777b643e60a0fd2a51bc6f4623b438d5168dd53c42b4daf87b80d52cfac3cd1cfa368976
SOURCE_URL=http://git-core.googlecode.com/files/$SOURCE
# SOURCE2_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE2
# SOURCE2_IGNORE=signature
@@ -12,7 +12,7 @@ if [[ $GIT_DOC == manpages || $GIT_DOC == both ]]; then
SOURCE3=$SPELL-manpages-$VERSION.tar.gz
# SOURCE4=$SOURCE3.sign
# SOURCE3_GPG=kernel.gpg:$SOURCE3.sign:UPSTREAM_KEY
-
SOURCE3_HASH=sha512:5ae20d1e212e6762d02ccbac138fbabff1e4431083589a074662789eb23e5393558f01fa96d20d80f6679e4e3ac941105202730d01a6d093677507166d1db42f
+
SOURCE3_HASH=sha512:6f8fa833b31fb8b3c0d9ce1cbc05ef3295c4ecc15703e878b5f1a86244241db399b20b5ee167cbf8989b70c6d72efa3410d47adc9b31b648bc2c901d9041d238
SOURCE3_URL=http://git-core.googlecode.com/files/$SOURCE3
# SOURCE4_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE4
# SOURCE4_IGNORE=signature
@@ -21,7 +21,7 @@ if [[ $GIT_DOC == htmldocs || $GIT_DOC == both ]]; then
SOURCE5=$SPELL-htmldocs-$VERSION.tar.gz
# SOURCE6=$SOURCE5.sign
# SOURCE5_GPG=kernel.gpg:$SOURCE5.sign:UPSTREAM_KEY
-
SOURCE5_HASH=sha512:9f8b0cf36cb7da07e6a0bde2c091505a4d7af8f952858abec15d813b266c6d620d255eeb4b02789da5726795a4c8463bc013b40ea06b3f873029d7fb67ce568d
+
SOURCE5_HASH=sha512:0665ec103487ee2b796607b5d19492d60ee2b62af46a87f38fa5973da66ca6fc75f5df5f8a3fd8e926a28c578ff30342e52f25da7084fc02c685289fc7d7689b
SOURCE5_URL=http://git-core.googlecode.com/files/$SOURCE5
# SOURCE6_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE6
# SOURCE6_IGNORE=signature
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index 55da9a0..c883173 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,6 @@
+2013-03-21 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.8.2
+
2013-02-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.8.1.3

diff --git a/devel/qt-creator/DETAILS b/devel/qt-creator/DETAILS
index 4e2d77d..13fbeac 100755
--- a/devel/qt-creator/DETAILS
+++ b/devel/qt-creator/DETAILS
@@ -1,10 +1,10 @@
SPELL=qt-creator
if [[ "${QTCREATOR_DEVEL}" == "y" ]]; then
- VERSION=2.7.0-rc
-
SOURCE_HASH=sha512:3775b6ad1c6f4ee10d75a91700c7c4d92745d6f264a56274f55faa062c6a1a56bb864d8049da4da3067a843986ff9b5957c39a584f259c06a6782d578a94ffa5
+ VERSION=2.7.0
+
SOURCE_HASH=sha512:bb4b941c8acb3572450c3eb8a70807480cbe1f23b1eb7150fcbac5b766c5a109567822a3f2644164f894f736a2d8fcc972d013a9f475ae72f97609afc98b89fc
else
- VERSION=2.6.2
-
SOURCE_HASH=sha512:62a8def36bd6c10c0fd44977428b518b7111229d1ca847e263d61a39bd6b51eb40c0699dbccdc96a8b8980c453d0cf9c57cd8c59054df0f24c5b5af62ea7091d
+ VERSION=2.7.0
+
SOURCE_HASH=sha512:bb4b941c8acb3572450c3eb8a70807480cbe1f23b1eb7150fcbac5b766c5a109567822a3f2644164f894f736a2d8fcc972d013a9f475ae72f97609afc98b89fc
fi
SOURCE=$SPELL-$VERSION-src.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION-src
diff --git a/devel/qt-creator/HISTORY b/devel/qt-creator/HISTORY
index c0335e8..24d554f 100644
--- a/devel/qt-creator/HISTORY
+++ b/devel/qt-creator/HISTORY
@@ -1,3 +1,6 @@
+2013-03-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.7.0
+
2013-03-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: devel 2.7.0-rc

diff --git a/disk/gparted/DETAILS b/disk/gparted/DETAILS
index 8863f30..e8cae09 100755
--- a/disk/gparted/DETAILS
+++ b/disk/gparted/DETAILS
@@ -1,6 +1,6 @@
SPELL=gparted
- VERSION=0.13.1
-
SOURCE_HASH=sha512:a0a6af764f5be094ba88057ceb10cd0ed9204fbedd6b8d25fae8e35cb0fec347f90fb0b2054f6d41dd3fc362fafa7a03beedb96b602a1b9c6ac32d060768da9d
+ VERSION=0.15.0
+
SOURCE_HASH=sha512:e0ac43a6f6457c34caae8f7e4072d17391d3ce83a537e15d0a822b813545970aff1370bac3f4d78202d175e3e3e867fc5f97bd4ce2133162a34d2f2f88a9f6e7
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/disk/gparted/HISTORY b/disk/gparted/HISTORY
index 528e914..9ec8d6c 100644
--- a/disk/gparted/HISTORY
+++ b/disk/gparted/HISTORY
@@ -1,3 +1,6 @@
+2013-03-22 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.15.0
+
2012-08-11 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.13.1

diff --git a/doc/man-pages/DETAILS b/doc/man-pages/DETAILS
index cffee15..dd78391 100755
--- a/doc/man-pages/DETAILS
+++ b/doc/man-pages/DETAILS
@@ -1,6 +1,6 @@
SPELL=man-pages
- VERSION=3.46
-
SOURCE_HASH=sha512:eae6ec2071396ff5eabded8e8b81407126d4c27c5fe69e8786a837dc646fafecaa2bcbd3b8819108eb9099f56e9ef5ecff4e5be651fff81bb5b754159c4bb254
+ VERSION=3.50
+
SOURCE_HASH=sha512:665c039f5952fbddc46bae70a0208a07c3e76a674edd9bd804b823462afb3f579605129ed1d8c62bc4e66b7c8c3fa591d2c3369c6f6fd603f19bb2388a8352c5
SOURCE=$SPELL-$VERSION.tar.xz
# SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/doc/man-pages/HISTORY b/doc/man-pages/HISTORY
index 42d95ba..0a8a502 100644
--- a/doc/man-pages/HISTORY
+++ b/doc/man-pages/HISTORY
@@ -1,3 +1,6 @@
+2013-03-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.50
+
2013-02-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.46

diff --git a/ftp/ncdc/DETAILS b/ftp/ncdc/DETAILS
index ea20ec4..5a7e426 100755
--- a/ftp/ncdc/DETAILS
+++ b/ftp/ncdc/DETAILS
@@ -1,5 +1,5 @@
SPELL=ncdc
- VERSION=1.15
+ VERSION=1.16
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://dev.yorhel.nl/download/$SOURCE
diff --git a/ftp/ncdc/HISTORY b/ftp/ncdc/HISTORY
index e8143a2..c92dcf8 100644
--- a/ftp/ncdc/HISTORY
+++ b/ftp/ncdc/HISTORY
@@ -1,3 +1,6 @@
+2013-03-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.16
+
2013-03-03 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.15

diff --git a/graphics-libs/poppler/DETAILS b/graphics-libs/poppler/DETAILS
index d07a2f8..4718b3c 100755
--- a/graphics-libs/poppler/DETAILS
+++ b/graphics-libs/poppler/DETAILS
@@ -12,11 +12,11 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
SOURCE_IGNORE=volatile
else
if [[ $POPPLER_BRANCH == devel ]]; then
- VERSION=0.22.1
-
SOURCE_HASH=sha512:038729dbdba8800f4944613fe40c6925cf424ee86e88048ffe50c72c5e86650dfd79fe39296480c837873dbf8f2c0acee8d803721c24203d9e355858a10ef9e2
+ VERSION=0.22.2
+
SOURCE_HASH=sha512:ce962f12a87f873a46cf8d02c0620694893a6e1857ac680174c4d9388d2255b5011e62e28b34a6e0abec9c8779530bf91ac123206a619a6eba59be92adb02d42
else
- VERSION=0.22.1
-
SOURCE_HASH=sha512:038729dbdba8800f4944613fe40c6925cf424ee86e88048ffe50c72c5e86650dfd79fe39296480c837873dbf8f2c0acee8d803721c24203d9e355858a10ef9e2
+ VERSION=0.22.2
+
SOURCE_HASH=sha512:ce962f12a87f873a46cf8d02c0620694893a6e1857ac680174c4d9388d2255b5011e62e28b34a6e0abec9c8779530bf91ac123206a619a6eba59be92adb02d42
fi
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index e9118a6..83429a8 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,6 @@
+2013-03-22 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.22.2
+
2013-03-03 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: SECURITY_PATCH++ (CVE-2013-1788-1790)

diff --git a/graphics/xli/0001-add-missing-include.patch
b/graphics/xli/0001-add-missing-include.patch
new file mode 100644
index 0000000..fe32690
--- /dev/null
+++ b/graphics/xli/0001-add-missing-include.patch
@@ -0,0 +1,24 @@
+From 5d07b7fcd93e0684702484283f897664211b30f5 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Wed, 20 Mar 2013 18:20:34 +0100
+Subject: [PATCH] add missing include
+
+---
+ ddxli.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ddxli.h b/ddxli.h
+index 9122aa7..1dd7837 100644
+--- a/ddxli.h
++++ b/ddxli.h
+@@ -13,6 +13,7 @@
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
+ #include <X11/extensions/XShm.h>
++#include <string.h>
+
+ #if defined(SYSV) || defined(VMS)
+ #include <string.h>
+--
+1.8.1.3
+
diff --git a/graphics/xli/BUILD b/graphics/xli/BUILD
index 39978a9..2ab39ac 100755
--- a/graphics/xli/BUILD
+++ b/graphics/xli/BUILD
@@ -1,2 +1,2 @@
xmkmf &&
-default_build_make
+make CDEBUGFLAGS="-Wall $(CFLAGS)" CXXDEBUGFLAGS="$(CXXFLAGS)"
LOCAL_LDFLAGS="$(LDFLAGS)" PROJECT_DEFINES="$(CPPFLAGS)"
diff --git a/graphics/xli/DETAILS b/graphics/xli/DETAILS
index 754a0ee..ee9ad00 100755
--- a/graphics/xli/DETAILS
+++ b/graphics/xli/DETAILS
@@ -1,9 +1,12 @@
SPELL=xli
- VERSION=2005-02-27
- SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCE_URL[0]=http://distfiles.gentoo.org/distfiles/${SOURCE}
-
SOURCE_HASH=sha512:132b28396ebf3832dc35ff5fa7c102539ef30a194512fe6577ce1432bb84ecd7b4368e75eaf59f26a806900f63e1bfb9a93487ce1ebe3cfef2199256a783ccf7
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ VERSION=1.17.0+20061110
+ SOURCE="${SPELL}_${VERSION}.orig.tar.gz"
+ SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/x/xli/${SOURCE}
+
SOURCE_HASH=sha512:03a1b6d20e71c8b30a04b92718dae05abb2fb7f8ee2b14453cc78957014a12fdbbd888a02ff27edf7be1dff1e4b8159f12ba7270312ffb70c3bb70657e08ede1
+ SOURCE2=${SPELL}_${VERSION}-4.diff.gz
+ SOURCE2_URL[0]=http://ftp.debian.org/debian/pool/main/x/xli/${SOURCE2}
+
SOURCE2_HASH=sha512:d12489452682333a81a1872ee0730fd40903d312dd741ef70f13dc830aea8d3918d73b45d09016948212458c286b4457b630ae556858abe00d11c978d3bc2558
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-2006-11-10"
WEB_SITE="http://web.aanet.com.au/gwg/xli.html";
LICENSE[0]=MIT
ENTERED=20130317
diff --git a/graphics/xli/HISTORY b/graphics/xli/HISTORY
index 59dde1b..85efdd8 100644
--- a/graphics/xli/HISTORY
+++ b/graphics/xli/HISTORY
@@ -1,3 +1,8 @@
+2013-03-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, PRE_BUILD, DETAILS, 0001-add-missing-include.patch: version
+ 1.17.0
+ * fix-scale-zoom.patch, libpng14.patch, xli-security-gentoo.diff:
removed
+
2013-03-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, DEPENDS, DETAILS, fix-scale-zoom.patch, INSTALL,
libpng14.patch,
PRE_BUILD, xli-security-gentoo.diff: spell created, patches are
from gentoo
diff --git a/graphics/xli/PRE_BUILD b/graphics/xli/PRE_BUILD
index 28ef520..c1b8dfd 100755
--- a/graphics/xli/PRE_BUILD
+++ b/graphics/xli/PRE_BUILD
@@ -1,11 +1,20 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-sedit 's:varargs.h:stdarg.h:' rlelib.c &&
-sedit "s:zopen:xli_zopen:g" * &&
-sed -i Imakefile \
- -e '/^DEFINES =/s/$/ -DHAVE_GUNZIP -DHAVE_BUNZIP2 /' \
- -e '/CCOPTIONS =/s/=.*/=/' &&
-sedit '/^#include "xli.h"/i#undef _BSD_SOURCE' png.c &&
-patch -p1 < ${SPELL_DIRECTORY}/xli-security-gentoo.diff &&
-patch -p1 < ${SPELL_DIRECTORY}/fix-scale-zoom.patch &&
-patch -p0 < ${SPELL_DIRECTORY}/libpng14.patch
+zcat ${SOURCE_CACHE}/${SOURCE2} | patch -p1 &&
+
+sedit 's:DEFINES = -DHAS_MEMCPY:DEFINES = -DHAS_MEMCPY -DHAVE_GUNZIP:'
${SOURCE_DIRECTORY}/Imakefile &&
+
+patch -p1 < ${SOURCE_DIRECTORY}/debian/patches/manpage.diff
&&
+patch -p1 < ${SOURCE_DIRECTORY}/debian/patches/8-bit_pallette_support.diff
&&
+patch -p1 <
${SOURCE_DIRECTORY}/debian/patches/read_past_bufferend_343718.diff &&
+patch -p1 < ${SOURCE_DIRECTORY}/debian/patches/security_fixes.diff
&&
+patch -p1 < ${SOURCE_DIRECTORY}/debian/patches/fillscreen_forall.diff
&&
+patch -p1 < ${SOURCE_DIRECTORY}/debian/patches/multiple_images_merge.diff
&&
+patch -p1 < ${SOURCE_DIRECTORY}/debian/patches/xpm_background.patch
&&
+patch -p1 < ${SOURCE_DIRECTORY}/debian/patches/arrow_keys.diff
&&
+patch -p1 < ${SOURCE_DIRECTORY}/debian/patches/documentzooming.diff
&&
+patch -p1 < ${SOURCE_DIRECTORY}/debian/patches/zoom_auto_440768.diff
&&
+patch -p1 < ${SOURCE_DIRECTORY}/debian/patches/manpage_fixes.diff
&&
+patch -p1 < ${SOURCE_DIRECTORY}/debian/patches/fix-x-resource-leak
&&
+patch -p1 < ${SOURCE_DIRECTORY}/debian/patches/disable-libjpeg-scaling
&&
+patch -p1 < ${SPELL_DIRECTORY}/0001-add-missing-include.patch
diff --git a/graphics/xli/fix-scale-zoom.patch
b/graphics/xli/fix-scale-zoom.patch
deleted file mode 100644
index 44ee262..0000000
--- a/graphics/xli/fix-scale-zoom.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-As of jpeg-7, the scale coefficents may be set to non-unitary values by the
-initial DCT transform. This caused the original already-scale detection
-algorithm in xli to break.
-
-To avoid this, set the already-scaled marker when we adjust the scale
fraction
-(that gets passed into the DCT).
-
-Signed-off-by: Robin H. Johnson <robbat2 AT gentoo.org>
-
-diff -Nuar -X x xli-2005-02-27.orig/jpeg.c xli-2005-02-27/jpeg.c
---- xli-2005-02-27.orig/jpeg.c 2005-02-27 16:42:39.000000000 -0800
-+++ xli-2005-02-27/jpeg.c 2009-09-05 15:02:12.462635389 -0700
-@@ -211,7 +211,7 @@
- xli_jpg_err jerr;
- Image *image = 0;
- byte **rows = 0;
-- int i, rowbytes;
-+ int i, rowbytes, flags;
-
- CURRFUNC("jpegLoad");
- zfp = zopen(fullname);
-@@ -248,9 +248,13 @@
- if (verbose)
- describe_jpeg(&cinfo, fullname);
-
-+ flags = 0;
- if (image_ops->iscale > 0 && image_ops->iscale < 4) {
-- cinfo.scale_num = 1;
-- cinfo.scale_denom = 1 << image_ops->iscale;
-+ flags |= FLAG_ISCALE;
-+ //cinfo.scale_num = 1;
-+ cinfo.scale_denom *= 1 << image_ops->iscale;
-+ if (verbose)
-+ printf("scaling to %d/%d\n", cinfo.scale_num,
cinfo.scale_denom);
- } else if (image_ops->iscale_auto) {
- image_ops->iscale = 0;
- while (image_ops->iscale < 3 && (cinfo.image_width >>
-@@ -258,9 +262,11 @@
- cinfo.image_height >> image_ops->iscale >
- globals.dinfo.height * .9))
- image_ops->iscale += 1;
-- cinfo.scale_denom = 1 << image_ops->iscale;
-+ cinfo.scale_denom *= 1 << image_ops->iscale;
-+ if(image_ops->iscale > 0)
-+ flags |= FLAG_ISCALE;
- if (verbose)
-- printf("auto-scaling to 1/%d\n", cinfo.scale_denom);
-+ printf("auto-scaling to %d/%d\n", cinfo.scale_num,
cinfo.scale_denom);
- }
- znocache(zfp);
-
-@@ -288,8 +294,7 @@
- }
-
- image->gamma = RETURN_GAMMA;
-- if (cinfo.scale_denom > 1)
-- image->flags |= FLAG_ISCALE;
-+ image->flags |= flags;
-
- rowbytes = cinfo.output_width * cinfo.output_components;
- assert(image->pixlen * image->width == rowbytes);
diff --git a/graphics/xli/libpng14.patch b/graphics/xli/libpng14.patch
deleted file mode 100644
index afb4b24..0000000
--- a/graphics/xli/libpng14.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://aur.archlinux.org/packages.php?ID=1676
-http://archwyrm.net/~me/xli-libpng.diff
-
---- png.c
-+++ png.c
-@@ -27,7 +27,7 @@
- if (ret != 8)
- return 0;
-
-- ret = png_check_sig(buf, 8);
-+ ret = !png_sig_cmp(buf, 0, 8);
-
- return (ret);
- }
diff --git a/graphics/xli/xli-security-gentoo.diff
b/graphics/xli/xli-security-gentoo.diff
deleted file mode 100644
index 7425e67..0000000
--- a/graphics/xli/xli-security-gentoo.diff
+++ /dev/null
@@ -1,199 +0,0 @@
-diff -Nrup xli-2005-02-27/imagetypes.c xli-2005-02-27/imagetypes.c
---- xli-2005-02-27/imagetypes.c 1999-10-24 22:14:57.000000000 -0400
-+++ xli-2005-02-27/imagetypes.c 2005-10-18 07:53:46.000000000 -0400
-@@ -53,7 +53,7 @@ Image *loadImage(ImageOptions * image_op
- Image *image;
- int a;
-
-- if (findImage(image_ops->name, fullname) < 0) {
-+ if (findImage(image_ops->name, fullname, BUFSIZ) < 0) {
- if (errno == ENOENT)
- printf("%s: image not found\n", image_ops->name);
- else if (errno == EISDIR)
-@@ -95,7 +95,7 @@ void identifyImage(char *name)
- char fullname[BUFSIZ];
- int a;
-
-- if (findImage(name, fullname) < 0) {
-+ if (findImage(name, fullname, BUFSIZ) < 0) {
- if (errno == ENOENT)
- printf("%s: image not found\n", name);
- else if (errno == EISDIR)
-diff -Nrup xli-2005-02-27/path.c xli-2005-02-27/path.c
---- xli-2005-02-27/path.c 2005-02-27 19:42:39.000000000 -0500
-+++ xli-2005-02-27/path.c 2005-10-18 07:56:45.000000000 -0400
-@@ -172,12 +172,12 @@ static int fileIsOk(char *fullname, stru
- /* find an image with paths and extensions from defaults files. returns
- * -1 if access denied or not found, 0 if ok.
- */
--int findImage(char *name, char *fullname)
-+int findImage(char *name, char *fullname, size_t size)
- {
- unsigned int p, e;
- struct stat sbuf;
-
-- strcpy(fullname, name);
-+ strncpy(fullname, name, size);
- if (!strcmp(name, "stdin")) /* stdin is special name */
- return (0);
-
-@@ -185,26 +185,26 @@ int findImage(char *name, char *fullname
- if (!stat(fullname, &sbuf))
- return (fileIsOk(fullname, &sbuf));
- #ifndef NO_COMPRESS
-- strcat(fullname, ".Z");
-+ strncat(fullname, ".Z", size);
- if (!stat(fullname, &sbuf))
- return (fileIsOk(fullname, &sbuf));
- #endif
-
- for (p = 0; p < NumPaths; p++) {
-- sprintf(fullname, "%s/%s", Paths[p], name);
-+ snprintf(fullname, size, "%s/%s", Paths[p], name);
- if (!stat(fullname, &sbuf))
- return (fileIsOk(fullname, &sbuf));
- #ifndef NO_COMPRESS
-- strcat(fullname, ".Z");
-+ strncat(fullname, ".Z", size);
- if (!stat(fullname, &sbuf))
- #endif
- return (fileIsOk(fullname, &sbuf));
- for (e = 0; e < NumExts; e++) {
-- sprintf(fullname, "%s/%s%s", Paths[p], name, Exts[e]);
-+ snprintf(fullname, size, "%s/%s%s", Paths[p], name,
Exts[e]);
- if (!stat(fullname, &sbuf))
- return (fileIsOk(fullname, &sbuf));
- #ifndef NO_COMPRESS
-- strcat(fullname, ".Z");
-+ strncat(fullname, ".Z", size);
- if (!stat(fullname, &sbuf))
- return (fileIsOk(fullname, &sbuf));
- #endif
-@@ -212,11 +212,11 @@ int findImage(char *name, char *fullname
- }
-
- for (e = 0; e < NumExts; e++) {
-- sprintf(fullname, "%s%s", name, Exts[e]);
-+ snprintf(fullname, size, "%s%s", name, Exts[e]);
- if (!stat(fullname, &sbuf))
- return (fileIsOk(fullname, &sbuf));
- #ifndef NO_COMPRESS
-- strcat(fullname, ".Z");
-+ strncat(fullname, ".Z", size);
- if (!stat(fullname, &sbuf))
- return (fileIsOk(fullname, &sbuf));
- #endif
-@@ -241,7 +241,7 @@ void listImages(void)
- for (a = 0; a < NumPaths; a++) {
- printf("%s:\n", Paths[a]);
- fflush(stdout);
-- sprintf(buf, "ls %s", Paths[a]);
-+ snprintf(buf, sizeof(buf)-1, "ls %s", Paths[a]);
- if (system(buf) < 0) {
- perror("ls");
- return;
-@@ -296,14 +296,14 @@ char *expandPath(char *p)
- var++;
- else if (*p == '~') {
- buf1[b1] = '\0';
-- strcat(buf1, getenv("HOME"));
-+ strncat(buf1, getenv("HOME"), sizeof(buf1)-1);
- b1 = strlen(buf1);
- var = 0;
- } else if (*p == '/' || *p == '}') {
- if (var) {
- buf1[b1] = '\0';
- buf2[b2] = '\0';
-- strcat(buf1, getenv(buf2));
-+ strncat(buf1, getenv(buf2), sizeof(buf1));
- b1 = strlen(buf1);
- buf2[0] = '\0';
- b2 = 0;
-diff -Nrup xli-2005-02-27/reduce.c xli-2005-02-27/reduce.c
---- xli-2005-02-27/reduce.c 1999-10-24 22:15:02.000000000 -0400
-+++ xli-2005-02-27/reduce.c 2005-10-18 07:33:34.000000000 -0400
-@@ -178,7 +178,7 @@ Image *reduce(Image *image, unsigned col
- /* get destination image */
- depth = colorsToDepth(OutColors);
- new_image = newRGBImage(image->width, image->height, depth);
-- sprintf(buf, "%s (%d colors)", image->title, OutColors);
-+ snprintf(buf, sizeof(buf)-1, "%s (%d colors)", image->title,
OutColors);
- new_image->title = dupString(buf);
- new_image->gamma = image->gamma;
-
-diff -Nrup xli-2005-02-27/rlelib.c xli-2005-02-27/rlelib.c
---- xli-2005-02-27/rlelib.c 2005-10-18 07:40:51.000000000 -0400
-+++ xli-2005-02-27/rlelib.c 2005-10-18 07:48:12.000000000 -0400
-@@ -18,7 +18,7 @@
- #undef DEBUG
-
- #ifdef DEBUG
--# define debug(xx) fprintf(stderr,xx)
-+# define debug(xx) fprintf(stderr, "%s", xx)
- #else
- # define debug(xx)
- #endif
-Files xli-2005-02-27/xli and xli-2005-02-27/xli differ
-diff -Nrup xli-2005-02-27/xli.h xli-2005-02-27/xli.h
---- xli-2005-02-27/xli.h 1999-10-24 22:15:07.000000000 -0400
-+++ xli-2005-02-27/xli.h 2005-10-19 07:49:21.000000000 -0400
-@@ -229,7 +229,7 @@ char *xlistrstr(char *s1, char *s2);
-
- /* path.c */
- char *expandPath(char *p);
--int findImage(char *name, char *fullname);
-+int findImage(char *name, char *fullname, size_t size);
- void listImages(void);
- void loadPathsAndExts(void);
- void showPath(void);
-diff -Nrup xli-2005-02-27/xlito.c xli-2005-02-27/xlito.c
---- xli-2005-02-27/xlito.c 2005-02-27 19:42:39.000000000 -0500
-+++ xli-2005-02-27/xlito.c 2005-10-18 07:48:54.000000000 -0400
-@@ -31,7 +31,7 @@ char *pname, *fname;
- #undef DEBUG
-
- #ifdef DEBUG
--# define debug(xx) fprintf(stderr,xx)
-+# define debug(xx) fprintf(stderr, "%s", xx)
- #else
- # define debug(xx)
- #endif
-diff -Nrup xli-2005-02-27/zoom.c xli-2005-02-27/zoom.c
---- xli-2005-02-27/zoom.c 2005-02-27 19:42:39.000000000 -0500
-+++ xli-2005-02-27/zoom.c 2005-10-18 07:35:42.000000000 -0400
-@@ -52,30 +52,30 @@ Image *zoom(Image *oimage, unsigned int
- if (verbose)
- printf(" Zooming image Y axis by %d%%...", yzoom);
- if (changetitle)
-- sprintf(buf, "%s (Y zoom %d%%)", oimage->title, yzoom);
-+ snprintf(buf, sizeof(buf)-1, "%s (Y zoom %d%%)", oimage->title,
yzoom);
- }
- else if (!yzoom) {
- if (verbose)
- printf(" Zooming image X axis by %d%%...", xzoom);
- if (changetitle)
-- sprintf(buf, "%s (X zoom %d%%)", oimage->title, xzoom);
-+ snprintf(buf, sizeof(buf)-1, "%s (X zoom %d%%)", oimage->title,
xzoom);
- }
- else if (xzoom == yzoom) {
- if (verbose)
- printf(" Zooming image by %d%%...", xzoom);
- if (changetitle)
-- sprintf(buf, "%s (%d%% zoom)", oimage->title, xzoom);
-+ snprintf(buf, sizeof(buf)-1, "%s (%d%% zoom)", oimage->title, xzoom);
- }
- else {
- if (verbose)
- printf(" Zooming image X axis by %d%% and Y axis by %d%%...",
- xzoom, yzoom);
- if (changetitle)
-- sprintf(buf, "%s (X zoom %d%% Y zoom %d%%)", oimage->title,
-+ snprintf(buf, sizeof(buf)-1, "%s (X zoom %d%% Y zoom %d%%)",
oimage->title,
- xzoom, yzoom);
- }
- if (!changetitle)
-- strcpy(buf,oimage->title);
-+ strncpy(buf,oimage->title, sizeof(buf)-1);
-
- if (verbose)
- fflush(stdout);
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 885ae78..8220aeb 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,7 @@
+2013-03-21 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.8.4
+ * info/patches/maintenance_patches_3/patch-3.8.4: added
+
2013-03-15 Ladislav Hagara <hgr AT vabo.cz>
* latest.defaults: LATEST_maintenance_patches_3=patch-3.8.3
* info/patches/maintenance_patches_3/patch-3.8.3: added
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.8.4
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.8.4
new file mode 100755
index 0000000..2107222
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.8.4
@@ -0,0 +1,5 @@
+appliedkernels="3.8"
+patchversion="${appliedkernels}.4"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="d2609f8906450733eb89aae7dce2af4ee7c21101"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 33092a1..f87bf51 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -2,7 +2,7 @@ LATEST_3=3.8
LATEST_2_6=2.6.39
LATEST_PRE_2_6=patch-2.6.39
LATEST_maintenance_patches=patch-2.6.39.4
-LATEST_maintenance_patches_3=patch-3.8.3
+LATEST_maintenance_patches_3=patch-3.8.4
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.37.9
LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 256b589..4e36332 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -31,7 +31,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
SOURCE_URL="git://sourceware.org/git/glibc.git:$SPELL-git"
SOURCE_IGNORE=volatile
else
- VERSION=2.16.0
+ VERSION=2.17
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE2=$SOURCE.sig
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 226bfde..535628c 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,10 @@
+2013-01-24 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.17
+ * glibc.gpg: 6C2A4AFF removed, 82764ED5 added
+ * PRE_BUILD, fix-res_query-assert.patch, revert-c5a0802a.patch:
+ patches removed
+ * PRE_BUILD, glibc-2.17-sync-with-linux37.patch: patch from Arch added
+
2012-12-02 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: fixed source urls for GLIBC_SANITIZE_HEADERS=y in 2.6

diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 0e7cd49..99a69d6 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -96,11 +96,8 @@ patch -p1 < $SPELL_DIRECTORY/as-test-x.patch &&
# no idea why or how this is missing from configure
patch -p0 < $SPELL_DIRECTORY/as_fn_executable_p.patch &&

-# http://sourceware.org/bugzilla/show_bug.cgi?id=13013
-patch -p1 < $SPELL_DIRECTORY/fix-res_query-assert.patch &&
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=552960
-patch -p1 < $SPELL_DIRECTORY/revert-c5a0802a.patch &&
+# patch from Arch
+patch -p1 < $SPELL_DIRECTORY/glibc-2.17-sync-with-linux37.patch &&

# disabled libgd detection/building memusagestat for now until a better
# fix has been found, bug #8277
diff --git a/libs/glibc/fix-res_query-assert.patch
b/libs/glibc/fix-res_query-assert.patch
deleted file mode 100644
index 522c16f..0000000
--- a/libs/glibc/fix-res_query-assert.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/resolv/res_query.c
-+++ a/resolv/res_query.c
-@@ -122,6 +122,7 @@ __libc_res_nquery(res_state statp,
- int *resplen2)
- {
- HEADER *hp = (HEADER *) answer;
-+ HEADER *hp2;
- int n, use_malloc = 0;
- u_int oflags = statp->_flags;
-
-@@ -239,26 +240,25 @@ __libc_res_nquery(res_state statp,
- /* __libc_res_nsend might have reallocated the buffer. */
- hp = (HEADER *) *answerp;
-
-- /* We simplify the following tests by assigning HP to HP2. It
-- is easy to verify that this is the same as ignoring all
-- tests of HP2. */
-- HEADER *hp2 = answerp2 ? (HEADER *) *answerp2 : hp;
--
-- if (n < (int) sizeof (HEADER) && answerp2 != NULL
-- && *resplen2 > (int) sizeof (HEADER))
-+ /* We simplify the following tests by assigning HP to HP2 or
-+ vice versa. It is easy to verify that this is the same as
-+ ignoring all tests of HP or HP2. */
-+ if (answerp2 == NULL || *resplen2 < (int) sizeof (HEADER))
- {
-- /* Special case of partial answer. */
-- assert (hp != hp2);
-- hp = hp2;
-+ hp2 = hp;
- }
-- else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER)
-- && n > (int) sizeof (HEADER))
-+ else
- {
-- /* Special case of partial answer. */
-- assert (hp != hp2);
-- hp2 = hp;
-+ hp2 = (HEADER *) *answerp2;
-+ if (n < (int) sizeof (HEADER))
-+ {
-+ hp = hp2;
-+ }
- }
-
-+ /* Make sure both hp and hp2 are defined */
-+ assert((hp != NULL) && (hp2 != NULL));
-+
- if ((hp->rcode != NOERROR || ntohs(hp->ancount) == 0)
- && (hp2->rcode != NOERROR || ntohs(hp2->ancount) == 0)) {
- #ifdef DEBUG
diff --git a/libs/glibc/glibc-2.17-sync-with-linux37.patch
b/libs/glibc/glibc-2.17-sync-with-linux37.patch
new file mode 100644
index 0000000..4b9a960
--- /dev/null
+++ b/libs/glibc/glibc-2.17-sync-with-linux37.patch
@@ -0,0 +1,130 @@
+diff --git a/sysdeps/gnu/netinet/tcp.h b/sysdeps/gnu/netinet/tcp.h
+index 06e8414..b62a696 100644
+--- a/sysdeps/gnu/netinet/tcp.h
++++ b/sysdeps/gnu/netinet/tcp.h
+@@ -37,20 +37,29 @@
+ /*
+ * User-settable options (used with setsockopt).
+ */
+-#define TCP_NODELAY 1 /* Don't delay send to coalesce
packets */
+-#define TCP_MAXSEG 2 /* Set maximum segment size */
+-#define TCP_CORK 3 /* Control sending of partial frames */
+-#define TCP_KEEPIDLE 4 /* Start keeplives after this period */
+-#define TCP_KEEPINTVL 5 /* Interval between keepalives */
+-#define TCP_KEEPCNT 6 /* Number of keepalives before death */
+-#define TCP_SYNCNT 7 /* Number of SYN retransmits */
+-#define TCP_LINGER2 8 /* Life time of orphaned FIN-WAIT-2 state */
+-#define TCP_DEFER_ACCEPT 9 /* Wake up listener only when data arrive */
+-#define TCP_WINDOW_CLAMP 10 /* Bound advertised window */
+-#define TCP_INFO 11 /* Information about this connection. */
+-#define TCP_QUICKACK 12 /* Bock/reenable quick ACKs. */
+-#define TCP_CONGESTION 13 /* Congestion control algorithm. */
+-#define TCP_MD5SIG 14 /* TCP MD5 Signature (RFC2385) */
++#define TCP_NODELAY 1 /* Don't delay send to coalesce
packets */
++#define TCP_MAXSEG 2 /* Set maximum segment size */
++#define TCP_CORK 3 /* Control sending of partial frames */
++#define TCP_KEEPIDLE 4 /* Start keeplives after this period */
++#define TCP_KEEPINTVL 5 /* Interval between keepalives */
++#define TCP_KEEPCNT 6 /* Number of keepalives before death */
++#define TCP_SYNCNT 7 /* Number of SYN retransmits */
++#define TCP_LINGER2 8 /* Life time of orphaned FIN-WAIT-2 state
*/
++#define TCP_DEFER_ACCEPT 9 /* Wake up listener only when data arrive
*/
++#define TCP_WINDOW_CLAMP 10 /* Bound advertised window */
++#define TCP_INFO 11 /* Information about this connection. */
++#define TCP_QUICKACK 12 /* Bock/reenable quick ACKs. */
++#define TCP_CONGESTION 13 /* Congestion control algorithm.
*/
++#define TCP_MD5SIG 14 /* TCP MD5 Signature (RFC2385) */
++#define TCP_COOKIE_TRANSACTIONS 15 /* TCP Cookie Transactions */
++#define TCP_THIN_LINEAR_TIMEOUTS 16 /* Use linear timeouts for thin
streams*/
++#define TCP_THIN_DUPACK 17 /* Fast retrans. after 1 dupack */
++#define TCP_USER_TIMEOUT 18 /* How long for loss retry before timeout
*/
++#define TCP_REPAIR 19 /* TCP sock is under repair right now */
++#define TCP_REPAIR_QUEUE 20 /* Set TCP queue to repair */
++#define TCP_QUEUE_SEQ 21 /* Set sequence number of repaired queue.
*/
++#define TCP_REPAIR_OPTIONS 22 /* Repair TCP connection options */
++#define TCP_FASTOPEN 23 /* Enable FastOpen on listeners */
+
+ #ifdef __USE_MISC
+ # include <sys/types.h>
+@@ -173,7 +182,9 @@ enum
+ # define TCPI_OPT_TIMESTAMPS 1
+ # define TCPI_OPT_SACK 2
+ # define TCPI_OPT_WSCALE 4
+-# define TCPI_OPT_ECN 8
++# define TCPI_OPT_ECN 8 /* ECN was negociated at TCP session init
*/
++# define TCPI_OPT_ECN_SEEN 16 /* we received at least one packet with
ECT */
++# define TCPI_OPT_SYN_DATA 32 /* SYN-ACK acked data in SYN sent or rcvd
*/
+
+ /* Values for tcpi_state. */
+ enum tcp_ca_state
+@@ -241,6 +252,49 @@ struct tcp_md5sig
+ u_int8_t tcpm_key[TCP_MD5SIG_MAXKEYLEN]; /* Key (binary). */
+ };
+
++/* For socket repair options. */
++struct tcp_repair_opt
++{
++ u_int32_t opt_code;
++ u_int32_t opt_val;
++};
++
++/* Queue to repair, for TCP_REPAIR_QUEUE. */
++enum
++{
++ TCP_NO_QUEUE,
++ TCP_RECV_QUEUE,
++ TCP_SEND_QUEUE,
++ TCP_QUEUES_NR,
++};
++
++/* For cookie transactions socket options. */
++#define TCP_COOKIE_MIN 8 /* 64-bits */
++#define TCP_COOKIE_MAX 16 /* 128-bits */
++#define TCP_COOKIE_PAIR_SIZE (2*TCP_COOKIE_MAX)
++
++/* Flags for both getsockopt and setsockopt */
++#define TCP_COOKIE_IN_ALWAYS (1 << 0) /* Discard SYN without cookie
*/
++#define TCP_COOKIE_OUT_NEVER (1 << 1) /* Prohibit outgoing cookies,
++ * supercedes everything. */
++
++/* Flags for getsockopt */
++#define TCP_S_DATA_IN (1 << 2) /* Was data received? */
++#define TCP_S_DATA_OUT (1 << 3) /* Was data sent? */
++
++#define TCP_MSS_DEFAULT 536U /* IPv4 (RFC1122, RFC2581) */
++#define TCP_MSS_DESIRED 1220U /* IPv6 (tunneled), EDNS0
(RFC3226) */
++
++struct tcp_cookie_transactions
++{
++ u_int16_t tcpct_flags;
++ u_int8_t __tcpct_pad1;
++ u_int8_t tcpct_cookie_desired;
++ u_int16_t tcpct_s_data_desired;
++ u_int16_t tcpct_used;
++ u_int8_t tcpct_value[TCP_MSS_DEFAULT];
++};
++
+ #endif /* Misc. */
+
+ #endif /* netinet/tcp.h */
+diff --git a/sysdeps/unix/sysv/linux/bits/socket.h
b/sysdeps/unix/sysv/linux/bits/socket.h
+index df8f167..eadd7d9 100644
+--- a/sysdeps/unix/sysv/linux/bits/socket.h
++++ b/sysdeps/unix/sysv/linux/bits/socket.h
+@@ -1,6 +1,5 @@
+ /* System-specific socket constants and types. Linux version.
+- Copyright (C) 1991, 1992, 1994-2001, 2004, 2006-2010, 2011, 2012
+- Free Software Foundation, Inc.
++ Copyright (C) 1991-2013 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
+@@ -208,6 +207,8 @@ enum
+ #define MSG_MORE MSG_MORE
+ MSG_WAITFORONE = 0x10000, /* Wait for at least one packet to
return.*/
+ #define MSG_WAITFORONE MSG_WAITFORONE
++ MSG_FASTOPEN = 0x20000000, /* Send data in TCP SYN. */
++#define MSG_FASTOPEN MSG_FASTOPEN
+
+ MSG_CMSG_CLOEXEC = 0x40000000 /* Set close_on_exit for file
+ descriptor received through
diff --git a/libs/glibc/glibc.gpg b/libs/glibc/glibc.gpg
index 304df4b..95a2b71 100644
Binary files a/libs/glibc/glibc.gpg and b/libs/glibc/glibc.gpg differ
diff --git a/libs/glibc/revert-c5a0802a.patch
b/libs/glibc/revert-c5a0802a.patch
deleted file mode 100644
index ad4413a..0000000
--- a/libs/glibc/revert-c5a0802a.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-diff -rup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
---- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
2011-12-22 18:04:12.937212834 +0000
-+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
2011-12-22 18:04:42.104222278 +0000
-@@ -137,7 +137,6 @@ __pthread_cond_wait:
- cmpl $PI_BIT, %eax
- jne 18f
-
--90:
- movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %ecx
- movl %ebp, %edx
- xorl %esi, %esi
-@@ -151,9 +150,6 @@ __pthread_cond_wait:
- sete 16(%esp)
- je 19f
-
-- cmpl $-EAGAIN, %eax
-- je 91f
--
- /* Normal and PI futexes dont mix. Use normal futex functions only
- if the kernel does not support the PI futex functions. */
- cmpl $-ENOSYS, %eax
-@@ -398,78 +394,6 @@ __pthread_cond_wait:
- #endif
- call __lll_unlock_wake
- jmp 11b
--
--91:
--.LcleanupSTART2:
-- /* FUTEX_WAIT_REQUEUE_PI returned EAGAIN. We need to
-- call it again. */
--
-- /* Get internal lock. */
-- movl $1, %edx
-- xorl %eax, %eax
-- LOCK
--#if cond_lock == 0
-- cmpxchgl %edx, (%ebx)
--#else
-- cmpxchgl %edx, cond_lock(%ebx)
--#endif
-- jz 92f
--
--#if cond_lock == 0
-- movl %ebx, %edx
--#else
-- leal cond_lock(%ebx), %edx
--#endif
--#if (LLL_SHARED-LLL_PRIVATE) > 255
-- xorl %ecx, %ecx
--#endif
-- cmpl $-1, dep_mutex(%ebx)
-- setne %cl
-- subl $1, %ecx
-- andl $(LLL_SHARED-LLL_PRIVATE), %ecx
--#if LLL_PRIVATE != 0
-- addl $LLL_PRIVATE, %ecx
--#endif
-- call __lll_lock_wait
--
--92:
-- /* Increment the cond_futex value again, so it can be used as a new
-- expected value. */
-- addl $1, cond_futex(%ebx)
-- movl cond_futex(%ebx), %ebp
--
-- /* Unlock. */
-- LOCK
--#if cond_lock == 0
-- subl $1, (%ebx)
--#else
-- subl $1, cond_lock(%ebx)
--#endif
-- je 93f
--#if cond_lock == 0
-- movl %ebx, %eax
--#else
-- leal cond_lock(%ebx), %eax
--#endif
--#if (LLL_SHARED-LLL_PRIVATE) > 255
-- xorl %ecx, %ecx
--#endif
-- cmpl $-1, dep_mutex(%ebx)
-- setne %cl
-- subl $1, %ecx
-- andl $(LLL_SHARED-LLL_PRIVATE), %ecx
--#if LLL_PRIVATE != 0
-- addl $LLL_PRIVATE, %ecx
--#endif
-- call __lll_unlock_wake
--
--93:
-- /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */
-- xorl %ecx, %ecx
-- movl dep_mutex(%ebx), %edi
-- jmp 90b
--.LcleanupEND2:
--
- .size __pthread_cond_wait, .-__pthread_cond_wait
- versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
- GLIBC_2_3_2)
-@@ -642,10 +566,6 @@ __condvar_w_cleanup:
- .long .LcleanupEND-.Lsub_cond_futex
- .long __condvar_w_cleanup-.LSTARTCODE
- .uleb128 0
-- .long .LcleanupSTART2-.LSTARTCODE
-- .long .LcleanupEND2-.LcleanupSTART2
-- .long __condvar_w_cleanup-.LSTARTCODE
-- .uleb128 0
- .long .LcallUR-.LSTARTCODE
- .long .LENDCODE-.LcallUR
- .long 0
-Only in b/nptl/sysdeps/unix/sysv/linux/i386/i486: pthread_cond_wait.S.orig
-diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-22
18:04:12.941212837 +0000
-+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-22
18:05:05.155229737 +0000
-@@ -23,7 +23,6 @@
- #include <lowlevelcond.h>
- #include <tcb-offsets.h>
- #include <pthread-pi-defines.h>
--#include <pthread-errnos.h>
- #include <stap-probe.h>
-
- #include <kernel-features.h>
-@@ -137,14 +136,11 @@ __pthread_cond_wait:
- cmpl $PI_BIT, %eax
- jne 61f
-
--90:
- movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %esi
- movl $SYS_futex, %eax
- syscall
-
- movl $1, %r8d
-- cmpq $-EAGAIN, %rax
-- je 91f
- #ifdef __ASSUME_REQUEUE_PI
- jmp 62f
- #else
-@@ -331,70 +327,6 @@ __pthread_cond_wait:
-
- 13: movq %r10, %rax
- jmp 14b
--
--91:
--.LcleanupSTART2:
-- /* FUTEX_WAIT_REQUEUE_PI returned EAGAIN. We need to
-- call it again. */
-- movq 8(%rsp), %rdi
--
-- /* Get internal lock. */
-- movl $1, %esi
-- xorl %eax, %eax
-- LOCK
--#if cond_lock == 0
-- cmpxchgl %esi, (%rdi)
--#else
-- cmpxchgl %esi, cond_lock(%rdi)
--#endif
-- jz 92f
--
--#if cond_lock != 0
-- addq $cond_lock, %rdi
--#endif
-- LP_OP(cmp) $-1, dep_mutex-cond_lock(%rdi)
-- movl $LLL_PRIVATE, %eax
-- movl $LLL_SHARED, %esi
-- cmovne %eax, %esi
-- callq __lll_lock_wait
--#if cond_lock != 0
-- subq $cond_lock, %rdi
--#endif
--92:
-- /* Increment the cond_futex value again, so it can be used as a new
-- expected value. */
-- incl cond_futex(%rdi)
-- movl cond_futex(%rdi), %edx
--
-- /* Release internal lock. */
-- LOCK
--#if cond_lock == 0
-- decl (%rdi)
--#else
-- decl cond_lock(%rdi)
--#endif
-- jz 93f
--
--#if cond_lock != 0
-- addq $cond_lock, %rdi
--#endif
-- LP_OP(cmp) $-1, dep_mutex-cond_lock(%rdi)
-- movl $LLL_PRIVATE, %eax
-- movl $LLL_SHARED, %esi
-- cmovne %eax, %esi
-- /* The call preserves %rdx. */
-- callq __lll_unlock_wake
--#if cond_lock != 0
-- subq $cond_lock, %rdi
--#endif
--93:
-- /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */
-- xorq %r10, %r10
-- mov dep_mutex(%rdi), %R8_LP
-- leaq cond_futex(%rdi), %rdi
-- jmp 90b
--.LcleanupEND2:
--
- .size __pthread_cond_wait, .-__pthread_cond_wait
- versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
- GLIBC_2_3_2)
-@@ -547,15 +479,11 @@ __condvar_cleanup1:
- .uleb128 .LcleanupSTART-.LSTARTCODE
- .uleb128 .LcleanupEND-.LcleanupSTART
- .uleb128 __condvar_cleanup1-.LSTARTCODE
-- .uleb128 0
-- .uleb128 .LcleanupSTART2-.LSTARTCODE
-- .uleb128 .LcleanupEND2-.LcleanupSTART2
-- .uleb128 __condvar_cleanup1-.LSTARTCODE
-- .uleb128 0
-+ .uleb128 0
- .uleb128 .LcallUR-.LSTARTCODE
- .uleb128 .LENDCODE-.LcallUR
- .uleb128 0
-- .uleb128 0
-+ .uleb128 0
- .Lcstend:
-
diff --git a/science/qlandkarte-gt/DETAILS b/science/qlandkarte-gt/DETAILS
index 5d50597..62aebde 100755
--- a/science/qlandkarte-gt/DETAILS
+++ b/science/qlandkarte-gt/DETAILS
@@ -1,8 +1,8 @@
SPELL=qlandkarte-gt
- VERSION=1.6.0
+ VERSION=1.7.0
SOURCE="qlandkartegt-${VERSION}.tar.gz"

SOURCE_URL[0]=http://garr.dl.sourceforge.net/project/qlandkartegt/qlandkartegt/QLandkarteGT%20${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:c4736f9ca21d7002184c563a488f8c1ae194ab6f73675d3f7c947baeda82c6b655aeadd8402f05ac792f9986879b7b73f49fffa0a3c15b76bb90c6d6b6af0ee2
+
SOURCE_HASH=sha512:c5e5aabb0c44558ce639b3e70df045011c3b2080bddfa2c0685a3b6d171e9e4cc44abd4804f9e0a7f2d62ea6e6a997b8d041374f23eeb2b43accc6b9d4d48802
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/qlandkartegt-${VERSION}"
WEB_SITE="http://www.qlandkarte.org/";
LICENSE[0]=GPL
diff --git a/science/qlandkarte-gt/HISTORY b/science/qlandkarte-gt/HISTORY
index 01fdc9d..ef20f66 100644
--- a/science/qlandkarte-gt/HISTORY
+++ b/science/qlandkarte-gt/HISTORY
@@ -1,3 +1,6 @@
+2013-03-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.7.0
+
2013-02-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: add sub dependency on OPENGL for qt4

diff --git a/utils/file/DETAILS b/utils/file/DETAILS
index 84721c0..32e76ea 100755
--- a/utils/file/DETAILS
+++ b/utils/file/DETAILS
@@ -1,6 +1,6 @@
SPELL=file
- VERSION=5.13
-
SOURCE_HASH=sha512:14254237b3f70323a26832d4b614e546b9e403f4929c65ff008e3239b116eff682091fe09da241eab2e43e5ac84ac8518bb6262473808cceb38ccafeeda264fb
+ VERSION=5.14
+
SOURCE_HASH=sha512:76b1802234a4da30221e3f0bbbda3416fb40fb4cbaf1129f7b27e8dced16b074be1a14679170e9ef96ba75ef0e301eea48a1a0c084c68440efacc275b3e91857
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.astron.com/pub/file/$SOURCE
diff --git a/utils/file/HISTORY b/utils/file/HISTORY
index 4716041..3e1555c 100644
--- a/utils/file/HISTORY
+++ b/utils/file/HISTORY
@@ -1,3 +1,6 @@
+2013-03-22 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 5.14
+
2013-02-24 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.13

diff --git a/utils/powertop/DETAILS b/utils/powertop/DETAILS
index 82b75ec..3091df8 100755
--- a/utils/powertop/DETAILS
+++ b/utils/powertop/DETAILS
@@ -1,6 +1,6 @@
SPELL=powertop
- VERSION=2.2
-
SOURCE_HASH=sha512:f57586e100ca36a6787cd9a3794a8f057fffe7bd9decaa8cf04b9d81300bb1da7c2d1f7eab91e3c0faa9616b7d47007b6b796dcd777bde5aec53dbe3a7ed4bec
+ VERSION=2.3
+
SOURCE_HASH=sha512:e30251be4b7e83438f57660b098f3e79c549c583a817af4749005a1971c51f8890f231427a5ab0780a159f01e71703b06640aa4399dc7e9a1e8f415a5bfe4363
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=https://01.org/powertop/sites/default/files/downloads/${SOURCE}
diff --git a/utils/powertop/HISTORY b/utils/powertop/HISTORY
index 7404065..1c668f9 100644
--- a/utils/powertop/HISTORY
+++ b/utils/powertop/HISTORY
@@ -1,3 +1,6 @@
+2013-03-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.3
+
2013-03-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.2




  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (040f92b2c115170ad72b7a4aa51c613bd7f92248), Eric Sandall, 03/22/2013

Archive powered by MHonArc 2.6.24.

Top of Page