[arch-commits] Commit in libxslt/repos (3 files)

Jan de Groot jgc at archlinux.org
Sun Nov 8 11:04:10 EST 2009


    Date: Sunday, November 8, 2009 @ 11:04:10
  Author: jgc
Revision: 58465

Merged revisions 58463 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/libxslt/trunk

........
  r58463 | jgc | 2009-11-08 17:03:49 +0100 (Sun, 08 Nov 2009) | 2 lines
  
  upgpkg: libxslt 1.1.26-1
      Update to 1.1.26, remove old patch
........

Modified:
  libxslt/repos/extra-i686/	(properties)
  libxslt/repos/extra-i686/PKGBUILD
Deleted:
  libxslt/repos/extra-i686/libxslt-1.1.24-exslt_crypt.patch

----------------------------------+
 PKGBUILD                         |   13 +--
 libxslt-1.1.24-exslt_crypt.patch |  152 -------------------------------------
 2 files changed, 5 insertions(+), 160 deletions(-)


Property changes on: libxslt/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /libxslt/trunk:1-26966
   + /libxslt/trunk:1-58463

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-11-08 16:03:57 UTC (rev 58464)
+++ extra-i686/PKGBUILD	2009-11-08 16:04:10 UTC (rev 58465)
@@ -3,23 +3,20 @@
 # Contributor: John Proctor <jproctor at prium.net>
 
 pkgname=libxslt
-pkgver=1.1.24
-pkgrel=2
+pkgver=1.1.26
+pkgrel=1
 pkgdesc="XML stylesheet transformation library"
 arch=('i686' 'x86_64')
 url="http://xmlsoft.org/XSLT/"
 license=('custom')
-depends=('libxml2>=2.7.3' 'libgcrypt>=1.4.3')
+depends=('libxml2>=2.7.6' 'libgcrypt>=1.4.4')
 makedepends=('python>=2.6')
 options=('!libtool')
-source=(ftp://xmlsoft.org/libxslt/${pkgname}-${pkgver}.tar.gz
-	libxslt-1.1.24-exslt_crypt.patch)
-md5sums=('e83ec5d27fc4c10c6f612879bea9a153'
-	 'bf43a510a37fbca661c7ef3dd1eddfea')
+source=(ftp://xmlsoft.org/libxslt/${pkgname}-${pkgver}.tar.gz)
+md5sums=('e61d0364a30146aaa3001296f853b2b9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np0 -i "${srcdir}/libxslt-1.1.24-exslt_crypt.patch" || return 1
   ./configure --prefix=/usr || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1

Deleted: extra-i686/libxslt-1.1.24-exslt_crypt.patch
===================================================================
--- extra-i686/libxslt-1.1.24-exslt_crypt.patch	2009-11-08 16:03:57 UTC (rev 58464)
+++ extra-i686/libxslt-1.1.24-exslt_crypt.patch	2009-11-08 16:04:10 UTC (rev 58465)
@@ -1,152 +0,0 @@
-Index: libexslt/crypto.c
-===================================================================
---- libexslt/crypto.c	(revision 1479)
-+++ libexslt/crypto.c	(working copy)
-@@ -595,11 +595,13 @@ exsltCryptoRc4EncryptFunction (xmlXPathP
-     int str_len = 0, bin_len = 0, hex_len = 0;
-     xmlChar *key = NULL, *str = NULL, *padkey = NULL;
-     xmlChar *bin = NULL, *hex = NULL;
-+    xsltTransformContextPtr tctxt = NULL;
- 
--    if ((nargs < 1) || (nargs > 3)) {
-+    if (nargs != 2) {
- 	xmlXPathSetArityError (ctxt);
- 	return;
-     }
-+    tctxt = xsltXPathGetTransformContext(ctxt);
- 
-     str = xmlXPathPopString (ctxt);
-     str_len = xmlUTF8Strlen (str);
-@@ -611,7 +613,7 @@ exsltCryptoRc4EncryptFunction (xmlXPathP
-     }
- 
-     key = xmlXPathPopString (ctxt);
--    key_len = xmlUTF8Strlen (str);
-+    key_len = xmlUTF8Strlen (key);
- 
-     if (key_len == 0) {
- 	xmlXPathReturnEmptyString (ctxt);
-@@ -620,15 +622,33 @@ exsltCryptoRc4EncryptFunction (xmlXPathP
- 	return;
-     }
- 
--    padkey = xmlMallocAtomic (RC4_KEY_LENGTH);
-+    padkey = xmlMallocAtomic (RC4_KEY_LENGTH + 1);
-+    if (padkey == NULL) {
-+	xsltTransformError(tctxt, NULL, tctxt->inst,
-+	    "exsltCryptoRc4EncryptFunction: Failed to allocate padkey\n");
-+	tctxt->state = XSLT_STATE_STOPPED;
-+	xmlXPathReturnEmptyString (ctxt);
-+	goto done;
-+    }
-+    memset(padkey, 0, RC4_KEY_LENGTH + 1);
-+
-     key_size = xmlUTF8Strsize (key, key_len);
-+    if ((key_size > RC4_KEY_LENGTH) || (key_size < 0)) {
-+	xsltTransformError(tctxt, NULL, tctxt->inst,
-+	    "exsltCryptoRc4EncryptFunction: key size too long or key broken\n");
-+	tctxt->state = XSLT_STATE_STOPPED;
-+	xmlXPathReturnEmptyString (ctxt);
-+	goto done;
-+    }
-     memcpy (padkey, key, key_size);
--    memset (padkey + key_size, '\0', sizeof (padkey));
- 
- /* encrypt it */
-     bin_len = str_len;
-     bin = xmlStrdup (str);
-     if (bin == NULL) {
-+	xsltTransformError(tctxt, NULL, tctxt->inst,
-+	    "exsltCryptoRc4EncryptFunction: Failed to allocate string\n");
-+	tctxt->state = XSLT_STATE_STOPPED;
- 	xmlXPathReturnEmptyString (ctxt);
- 	goto done;
-     }
-@@ -638,6 +658,9 @@ exsltCryptoRc4EncryptFunction (xmlXPathP
-     hex_len = str_len * 2 + 1;
-     hex = xmlMallocAtomic (hex_len);
-     if (hex == NULL) {
-+	xsltTransformError(tctxt, NULL, tctxt->inst,
-+	    "exsltCryptoRc4EncryptFunction: Failed to allocate result\n");
-+	tctxt->state = XSLT_STATE_STOPPED;
- 	xmlXPathReturnEmptyString (ctxt);
- 	goto done;
-     }
-@@ -670,11 +693,13 @@ exsltCryptoRc4DecryptFunction (xmlXPathP
-     int str_len = 0, bin_len = 0, ret_len = 0;
-     xmlChar *key = NULL, *str = NULL, *padkey = NULL, *bin =
- 	NULL, *ret = NULL;
-+    xsltTransformContextPtr tctxt = NULL;
- 
--    if ((nargs < 1) || (nargs > 3)) {
-+    if (nargs != 2) {
- 	xmlXPathSetArityError (ctxt);
- 	return;
-     }
-+    tctxt = xsltXPathGetTransformContext(ctxt);
- 
-     str = xmlXPathPopString (ctxt);
-     str_len = xmlUTF8Strlen (str);
-@@ -686,7 +711,7 @@ exsltCryptoRc4DecryptFunction (xmlXPathP
-     }
- 
-     key = xmlXPathPopString (ctxt);
--    key_len = xmlUTF8Strlen (str);
-+    key_len = xmlUTF8Strlen (key);
- 
-     if (key_len == 0) {
- 	xmlXPathReturnEmptyString (ctxt);
-@@ -695,22 +720,51 @@ exsltCryptoRc4DecryptFunction (xmlXPathP
- 	return;
-     }
- 
--    padkey = xmlMallocAtomic (RC4_KEY_LENGTH);
-+    padkey = xmlMallocAtomic (RC4_KEY_LENGTH + 1);
-+    if (padkey == NULL) {
-+	xsltTransformError(tctxt, NULL, tctxt->inst,
-+	    "exsltCryptoRc4EncryptFunction: Failed to allocate padkey\n");
-+	tctxt->state = XSLT_STATE_STOPPED;
-+	xmlXPathReturnEmptyString (ctxt);
-+	goto done;
-+    }
-+    memset(padkey, 0, RC4_KEY_LENGTH + 1);
-     key_size = xmlUTF8Strsize (key, key_len);
-+    if ((key_size > RC4_KEY_LENGTH) || (key_size < 0)) {
-+	xsltTransformError(tctxt, NULL, tctxt->inst,
-+	    "exsltCryptoRc4EncryptFunction: key size too long or key broken\n");
-+	tctxt->state = XSLT_STATE_STOPPED;
-+	xmlXPathReturnEmptyString (ctxt);
-+	goto done;
-+    }
-     memcpy (padkey, key, key_size);
--    memset (padkey + key_size, '\0', sizeof (padkey));
- 
- /* decode hex to binary */
-     bin_len = str_len;
-     bin = xmlMallocAtomic (bin_len);
-+    if (bin == NULL) {
-+	xsltTransformError(tctxt, NULL, tctxt->inst,
-+	    "exsltCryptoRc4EncryptFunction: Failed to allocate string\n");
-+	tctxt->state = XSLT_STATE_STOPPED;
-+	xmlXPathReturnEmptyString (ctxt);
-+	goto done;
-+    }
-     ret_len = exsltCryptoHex2Bin (str, str_len, bin, bin_len);
- 
- /* decrypt the binary blob */
-     ret = xmlMallocAtomic (ret_len);
-+    if (ret == NULL) {
-+	xsltTransformError(tctxt, NULL, tctxt->inst,
-+	    "exsltCryptoRc4EncryptFunction: Failed to allocate result\n");
-+	tctxt->state = XSLT_STATE_STOPPED;
-+	xmlXPathReturnEmptyString (ctxt);
-+	goto done;
-+    }
-     PLATFORM_RC4_DECRYPT (ctxt, padkey, bin, ret_len, ret, ret_len);
- 
-     xmlXPathReturnString (ctxt, ret);
- 
-+done:
-     if (key != NULL)
- 	xmlFree (key);
-     if (str != NULL)



More information about the arch-commits mailing list