summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/python/CVE-2011-1521.patch134
-rw-r--r--extra/raptor/fix-soprano-bug.patch20
-rw-r--r--extra/stardict/as-needed.patch29
-rw-r--r--extra/stardict/help-in-destdir.patch21
-rw-r--r--extra/vlc/vlc-1.1.10-libavformat.patch29
-rw-r--r--extra/xarchiver/PKGBUILD40
-rw-r--r--extra/xarchiver/xarchiver.install12
7 files changed, 0 insertions, 285 deletions
diff --git a/extra/python/CVE-2011-1521.patch b/extra/python/CVE-2011-1521.patch
deleted file mode 100644
index 91f4946c4..000000000
--- a/extra/python/CVE-2011-1521.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff -Naur Python-3.2.ori/Doc/library/urllib.request.rst Python-3.2/Doc/library/urllib.request.rst
---- Python-3.2.ori/Doc/library/urllib.request.rst 2011-02-11 03:25:47.000000000 -0800
-+++ Python-3.2/Doc/library/urllib.request.rst 2011-04-15 03:49:02.778745379 -0700
-@@ -650,6 +650,10 @@
- is the case, :exc:`HTTPError` is raised. See :rfc:`2616` for details of the
- precise meanings of the various redirection codes.
-
-+ An :class:`HTTPError` exception raised as a security consideration if the
-+ HTTPRedirectHandler is presented with a redirected url which is not an HTTP,
-+ HTTPS or FTP url.
-+
-
- .. method:: HTTPRedirectHandler.redirect_request(req, fp, code, msg, hdrs, newurl)
-
-diff -Naur Python-3.2.ori/Lib/test/test_urllib2.py Python-3.2/Lib/test/test_urllib2.py
---- Python-3.2.ori/Lib/test/test_urllib2.py 2011-02-11 03:25:47.000000000 -0800
-+++ Python-3.2/Lib/test/test_urllib2.py 2011-04-15 03:50:29.705417290 -0700
-@@ -8,6 +8,7 @@
-
- import urllib.request
- from urllib.request import Request, OpenerDirector
-+import urllib.error
-
- # XXX
- # Request
-@@ -1029,6 +1030,29 @@
- self.assertEqual(count,
- urllib.request.HTTPRedirectHandler.max_redirections)
-
-+
-+ def test_invalid_redirect(self):
-+ from_url = "http://example.com/a.html"
-+ valid_schemes = ['http','https','ftp']
-+ invalid_schemes = ['file','imap','ldap']
-+ schemeless_url = "example.com/b.html"
-+ h = urllib.request.HTTPRedirectHandler()
-+ o = h.parent = MockOpener()
-+ req = Request(from_url)
-+ req.timeout = socket._GLOBAL_DEFAULT_TIMEOUT
-+
-+ for scheme in invalid_schemes:
-+ invalid_url = scheme + '://' + schemeless_url
-+ self.assertRaises(urllib.error.HTTPError, h.http_error_302,
-+ req, MockFile(), 302, "Security Loophole",
-+ MockHeaders({"location": invalid_url}))
-+
-+ for scheme in valid_schemes:
-+ valid_url = scheme + '://' + schemeless_url
-+ h.http_error_302(req, MockFile(), 302, "That's fine",
-+ MockHeaders({"location": valid_url}))
-+ self.assertEqual(o.req.get_full_url(), valid_url)
-+
- def test_cookie_redirect(self):
- # cookies shouldn't leak into redirected requests
- from http.cookiejar import CookieJar
-diff -Naur Python-3.2.ori/Lib/test/test_urllib.py Python-3.2/Lib/test/test_urllib.py
---- Python-3.2.ori/Lib/test/test_urllib.py 2010-12-17 09:35:56.000000000 -0800
-+++ Python-3.2/Lib/test/test_urllib.py 2011-04-15 03:49:02.778745379 -0700
-@@ -2,6 +2,7 @@
-
- import urllib.parse
- import urllib.request
-+import urllib.error
- import http.client
- import email.message
- import io
-@@ -198,6 +199,21 @@
- finally:
- self.unfakehttp()
-
-+ def test_invalid_redirect(self):
-+ # urlopen() should raise IOError for many error codes.
-+ self.fakehttp(b'''HTTP/1.1 302 Found
-+Date: Wed, 02 Jan 2008 03:03:54 GMT
-+Server: Apache/1.3.33 (Debian GNU/Linux) mod_ssl/2.8.22 OpenSSL/0.9.7e
-+Location: file://guidocomputer.athome.com:/python/license
-+Connection: close
-+Content-Type: text/html; charset=iso-8859-1
-+''')
-+ try:
-+ self.assertRaises(urllib.error.HTTPError, urlopen,
-+ "http://python.org/")
-+ finally:
-+ self.unfakehttp()
-+
- def test_empty_socket(self):
- # urlopen() raises IOError if the underlying socket does not send any
- # data. (#1680230)
-diff -Naur Python-3.2.ori/Lib/urllib/request.py Python-3.2/Lib/urllib/request.py
---- Python-3.2.ori/Lib/urllib/request.py 2011-02-11 03:25:47.000000000 -0800
-+++ Python-3.2/Lib/urllib/request.py 2011-04-15 03:49:02.778745379 -0700
-@@ -545,6 +545,17 @@
-
- # fix a possible malformed URL
- urlparts = urlparse(newurl)
-+
-+ # For security reasons we don't allow redirection to anything other
-+ # than http, https or ftp.
-+
-+ if not urlparts.scheme in ('http', 'https', 'ftp'):
-+ raise HTTPError(newurl, code,
-+ msg +
-+ " - Redirection to url '%s' is not allowed" %
-+ newurl,
-+ headers, fp)
-+
- if not urlparts.path:
- urlparts = list(urlparts)
- urlparts[2] = "/"
-@@ -1897,8 +1908,24 @@
- return
- void = fp.read()
- fp.close()
-+
- # In case the server sent a relative URL, join with original:
- newurl = urljoin(self.type + ":" + url, newurl)
-+
-+ urlparts = urlparse(newurl)
-+
-+ # For security reasons, we don't allow redirection to anything other
-+ # than http, https and ftp.
-+
-+ # We are using newer HTTPError with older redirect_internal method
-+ # This older method will get deprecated in 3.3
-+
-+ if not urlparts.scheme in ('http', 'https', 'ftp'):
-+ raise HTTPError(newurl, errcode,
-+ errmsg +
-+ " Redirection to url '%s' is not allowed." % newurl,
-+ headers, fp)
-+
- return self.open(newurl)
-
- def http_error_301(self, url, fp, errcode, errmsg, headers, data=None):
diff --git a/extra/raptor/fix-soprano-bug.patch b/extra/raptor/fix-soprano-bug.patch
deleted file mode 100644
index ec7f087e0..000000000
--- a/extra/raptor/fix-soprano-bug.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/turtle_lexer.l b/src/turtle_lexer.l
-index c2f249b..f133747 100644
---- a/src/turtle_lexer.l
-+++ b/src/turtle_lexer.l
-@@ -381,9 +381,13 @@ EXPONENT [eE][+-]?[0-9]+
- while(1) {
- int c = yytext[yyleng - 1];
- if(c == '{' || c == ' ' || c=='\t' || c == '\v' || c == '\n' ||
-- c == ':' || c == '-') {
-+ c == '=' ) {
- yyleng--;
-- } else
-+ }
-+ else if ( yyleng >= 2 && ( c == '-' && yytext[yyleng - 2] == ':' ) ) {
-+ yyleng -= 2;
-+ }
-+ else
- break;
- }
- yytext[yyleng] = '\0';
diff --git a/extra/stardict/as-needed.patch b/extra/stardict/as-needed.patch
deleted file mode 100644
index 1e924be9f..000000000
--- a/extra/stardict/as-needed.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: stardict/src/Makefile.am
-===================================================================
---- stardict/src/Makefile.am (revision 489)
-+++ stardict/src/Makefile.am (working copy)
-@@ -26,9 +26,9 @@
- -DSTARDICT_LIB_DIR=\""$(libdir)/stardict"\"
-
-
--stardict_DEPENDENCIES = $(LOCAL_SIGCPP_LIBFILE) lib/libstardict.a
-+stardict_DEPENDENCIES = lib/libstardict.a $(LOCAL_SIGCPP_LIBFILE)
- stardict_LDFLAGS =
--stardict_LDADD = $(STARDICT_LIBS) $(LOCAL_SIGCPP_LIBFILE) lib/libstardict.a
-+stardict_LDADD = lib/libstardict.a $(STARDICT_LIBS) $(LOCAL_SIGCPP_LIBFILE)
-
- if !GNOME_SUPPORT
- if MAEMO_SUPPORT
-Index: stardict/tests/Makefile.am
-===================================================================
---- stardict/tests/Makefile.am (revision 489)
-+++ stardict/tests/Makefile.am (working copy)
-@@ -49,7 +49,7 @@
- t_res_database_SOURCES = t_res_database.cpp
- t_res_database_DEPENDENCIES = $(top_builddir)/src/lib/libstardict.a
-
--LDADD = @STARDICT_LIBS@ $(top_builddir)/src/lib/libstardict.a \
-+LDADD = $(top_builddir)/src/lib/libstardict.a $(STARDICT_LIBS) \
- $(LOCAL_SIGCPP_LIBFILE)
- ## -I$(top_builddir) is for config.h, it's generated by configure in the build dir
- AM_CPPFLAGS = @STARDICT_CFLAGS@ $(LOCAL_SIGCPP_INCLUDE) -I$(top_builddir) \
diff --git a/extra/stardict/help-in-destdir.patch b/extra/stardict/help-in-destdir.patch
deleted file mode 100644
index ba301b332..000000000
--- a/extra/stardict/help-in-destdir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -aur old/help/Makefile.am new/help/Makefile.am
---- old/help/Makefile.am 2011-01-03 17:14:20.000000000 +0100
-+++ new/help/Makefile.am 2011-01-13 21:42:06.046672489 +0100
-@@ -104,7 +104,7 @@
- else
- stardict-install-html:
- for lc in $(STARDICT_ALL_LINGUAS); do \
-- install_dir=$(STARDICT_HTML_INSTALL_DIR)/$${lc}; \
-+ install_dir=$(DESTDIR)$(STARDICT_HTML_INSTALL_DIR)/$${lc}; \
- htmldir=$(srcdir)/$${lc}/html; \
- for file in `find $${htmldir} -type f -print`; do \
- relfile=$${file#$${htmldir}/}; \
-@@ -126,7 +126,7 @@
- else
- stardict-uninstall-html:
- for lc in $(STARDICT_ALL_LINGUAS); do \
-- install_dir=$(STARDICT_HTML_INSTALL_DIR)/$${lc}; \
-+ install_dir=$(DESTDIR)$(STARDICT_HTML_INSTALL_DIR)/$${lc}; \
- rm -rf $${install_dir}; \
- done;
- endif
diff --git a/extra/vlc/vlc-1.1.10-libavformat.patch b/extra/vlc/vlc-1.1.10-libavformat.patch
deleted file mode 100644
index 4bec72334..000000000
--- a/extra/vlc/vlc-1.1.10-libavformat.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 21260bbb732d9de5540f809e1a54bde740f12a95 Mon Sep 17 00:00:00 2001
-From: Laurent Aimar <fenrir@videolan.org>
-Date: Tue, 7 Jun 2011 00:43:56 +0200
-Subject: [PATCH] Fix ByteIOContext init on recent libavformat
-
-Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
-(cherry picked from commit 4fc3bd15a3844e41a75760fa8e100feecea969a5)
-
-Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
----
- modules/demux/avformat/demux.c | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
-index fbb0b28..bd7c166 100644
---- a/modules/demux/avformat/demux.c
-+++ b/modules/demux/avformat/demux.c
-@@ -210,6 +210,9 @@ int OpenDemux( vlc_object_t *p_this )
- */
- p_sys->url.is_streamed = 1;
- p_sys->io.is_streamed = 1;
-+#if defined(AVIO_SEEKABLE_NORMAL)
-+ p_sys->io.seekable = 0;
-+#endif
- }
-
-
---
-1.7.2.5
diff --git a/extra/xarchiver/PKGBUILD b/extra/xarchiver/PKGBUILD
deleted file mode 100644
index 2abf0e7ad..000000000
--- a/extra/xarchiver/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 121261 2011-04-29 22:06:13Z andyrtr $
-# Maintainer: Alexander Fehr <pizzapunk gmail com>
-# Contributor: Andrew Simmons <andrew.simmons@gmail.com>
-
-pkgname=xarchiver
-pkgver=0.5.2
-pkgrel=2
-pkgdesc="GTK+ frontend to various command line archivers"
-arch=('i686' 'x86_64')
-url="http://xarchiver.sourceforge.net"
-license=('GPL')
-groups=('xfce4-goodies')
-depends=('gtk2' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool')
-optdepends=('tar: TAR support'
- 'gzip: GZIP support'
- 'bzip2: BZIP2 support'
- 'zip: ZIP support'
- 'unzip: ZIP support'
- 'unrar: RAR support'
- 'p7zip: 7z support'
- 'arj: ARJ support'
- 'lha: LHA support'
- 'lzma-utils: LZMA support'
- 'lzop: LZOP support')
-options=('!libtool')
-install=xarchiver.install
-source=(http://downloads.sourceforge.net/xarchiver/xarchiver-$pkgver.tar.bz2)
-md5sums=('2bc7f06403cc6582dd4a8029ec9d038d')
-
-build() {
- cd "$srcdir/xarchiver-$pkgver"
- ./configure --prefix=/usr --libexecdir=/usr/lib/xfce4
- make
-}
-
-package() {
- cd "$srcdir/xarchiver-$pkgver"
- make DESTDIR="$pkgdir" install
-}
diff --git a/extra/xarchiver/xarchiver.install b/extra/xarchiver/xarchiver.install
deleted file mode 100644
index c317fbaca..000000000
--- a/extra/xarchiver/xarchiver.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-22 04:28:37 +0000