Tue Nov 15 23:14:47 UTC 2011

5 files changed, 51 insertions, 55 deletions

diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD
index 1016c2578..92f98a12d 100644
--- a/extra/bitlbee/PKGBUILD
+++ b/extra/bitlbee/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 142478 2011-11-10 14:19:09Z bisson $
+# $Id: PKGBUILD 142776 2011-11-15 02:49:37Z bisson $
 # Contributor: FUBAR <mrfubar@gmail.com>
 # Contributor: simo <simo@archlinux.org>
 # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=bitlbee
 pkgver=3.0.3
-pkgrel=5
+pkgrel=6
 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
 arch=('i686' 'x86_64')
 url='http://www.bitlbee.org/'
@@ -19,7 +19,7 @@ source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz"
 	'xinetd'
 	'rc.d')
 sha1sums=('4140eb7aaa2c6a39fa059d19f8fbaec0d7a1ebff'
-          'e5880344ff96e6f061d850e7207f5f0bb31fb82b'
+          'fee9dcd59ad0231ffbcae822f17b68d9a8684376'
           '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
           'be09d29af3853825778331df451f16ca9e452d03')
 
diff --git a/extra/bitlbee/msn.patch b/extra/bitlbee/msn.patch
index e126784bf..55e2f9b92 100644
--- a/extra/bitlbee/msn.patch
+++ b/extra/bitlbee/msn.patch
@@ -1,29 +1,27 @@
---- bitlbee-3.0.3.old/protocols/msn/soap.h      2011-06-12 08:53:51.000000000 -0300
-+++ bitlbee-3.0.3/protocols/msn/soap.h  2011-11-09 21:35:56.000000000 -0200
-@@ -115,7 +115,7 @@ int msn_soapq_flush( struct im_connectio
-                "<wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>" \
-                "<wsp:AppliesTo>" \
-                    "<wsa:EndpointReference>" \
--                       "<wsa:Address>contacts.msn.com</wsa:Address>" \
-+                       "<wsa:Address>local-bay.contacts.msn.com</wsa:Address>" \
-                    "</wsa:EndpointReference>" \
-                "</wsp:AppliesTo>" \
-                "<wsse:PolicyReference xmlns=\"http://schemas.xmlsoap.org/ws/2003/06/secext\" URI=\"MBI\"></wsse:PolicyReference>" \
-@@ -198,7 +198,7 @@ int msn_soap_oim_send_queue( struct im_c
-   "</soap:Body>" \
- "</soap:Envelope>"
- 
--#define SOAP_MEMLIST_URL "http://contacts.msn.com/abservice/SharingService.asmx"
-+#define SOAP_MEMLIST_URL "http://local-bay.contacts.msn.com/abservice/SharingService.asmx"
- #define SOAP_MEMLIST_ACTION "http://www.msn.com/webservices/AddressBook/FindMembership"
- 
- #define SOAP_MEMLIST_PAYLOAD \
-@@ -233,7 +233,7 @@ int msn_soap_memlist_request( struct im_
- int msn_soap_memlist_edit( struct im_connection *ic, const char *handle, gboolean add, int list );
- 
- 
--#define SOAP_ADDRESSBOOK_URL "http://contacts.msn.com/abservice/abservice.asmx"
-+#define SOAP_ADDRESSBOOK_URL "http://local-bay.contacts.msn.com/abservice/abservice.asmx"
- #define SOAP_ADDRESSBOOK_ACTION "http://www.msn.com/webservices/AddressBook/ABFindAll"
- 
- #define SOAP_ADDRESSBOOK_PAYLOAD \
+Index: devel/lib/http_client.c

+===================================================================

+--- devel/lib/http_client.c	(revision devel,783)

++++ devel/lib/http_client.c	(revision devel,824)

+@@ -314,5 +314,5 @@

+ 	}

+ 	

+-	if( ( req->status_code == 301 || req->status_code == 302 ) && req->redir_ttl-- > 0 )

++	if( ( req->status_code >= 301 && req->status_code <= 303 ) && req->redir_ttl-- > 0 )

+ 	{

+ 		char *loc, *new_request, *new_host;

+@@ -375,8 +375,11 @@

+ 			   going to use strcat(), whether you like it or not. :-) */

+ 			

+-			sprintf( new_request, "GET %s HTTP/1.0", url->file );

+-			

+-			s = strstr( req->request, "\r\n" );

+-			if( s == NULL )

++			*s = 0;

++			sprintf( new_request, "%s %s HTTP/1.0\r\nHost: %s",

++			         req->status_code == 303 || req->request[0] == 'G' ? "GET" : "POST", url->file, url->host );

++			*s = ' ';

++			

++			if( !( ( s = strstr( req->request, "\r\nHost: " ) ) &&

++			       ( s = strstr( s + strlen( "\r\nHost: " ), "\r\n" ) ) ) )

+ 			{

+ 				req->status_string = g_strdup( "Error while rebuilding request string" );

diff --git a/extra/libfprint/PKGBUILD b/extra/libfprint/PKGBUILD
index e86ec45dc..b5b2ab225 100644
--- a/extra/libfprint/PKGBUILD
+++ b/extra/libfprint/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142461 2011-11-10 09:30:27Z heftig $
+# $Id: PKGBUILD 142730 2011-11-14 08:43:18Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 
 pkgname=libfprint
 pkgver=0.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for fingerprint readers"
 arch=(i686 x86_64)
 url="http://www.freedesktop.org/wiki/Software/fprint/libfprint"
@@ -18,8 +18,9 @@ md5sums=('858a0f0d7abd21ac494f9bec904dc156')
 
 build() {
   cd "$srcdir/$_snap"
-  ./autogen.sh --prefix=/usr --sysconfdir=/etc --disable-static \
-    --disable-examples-build --disable-x11-examples-build
+  sed -i '\|^./configure|,+1d' autogen.sh
+  ./autogen.sh
+  ./configure --prefix=/usr --sysconfdir=/etc --disable-static
   make
 }
 
diff --git a/extra/proftpd/PKGBUILD b/extra/proftpd/PKGBUILD
index 4199294d8..e0cb62afd 100644
--- a/extra/proftpd/PKGBUILD
+++ b/extra/proftpd/PKGBUILD
@@ -1,29 +1,30 @@
-# $Id: PKGBUILD 138532 2011-09-27 03:18:03Z eric $
+# $Id: PKGBUILD 142778 2011-11-15 04:26:53Z eric $
 # Maintainer:
-# Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=proftpd
-pkgver=1.3.3f
+pkgver=1.3.4a
 pkgrel=1
+epoch=1
 pkgdesc="A high-performance, scalable FTP server"
 arch=('i686' 'x86_64')
 url="http://www.proftpd.org"
 license=('GPL')
 depends=('libldap' 'libmysqlclient' 'postgresql-libs')
 backup=('etc/proftpd.conf' 'etc/conf.d/proftpd')
-source=("ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.bz2"
+source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.bz2{,.asc}
         'proftpd' 'proftpd.logrotate' 'proftpd.conf.d')
-md5sums=('e9416d2aa7ac1246af4fc8a80fd73f27'
-         '99f6f9a989e70e3fa50809fc2bbbbb0a'
-         'ddb09eb13131becdf0e081eef413116b'
-         '71d5932b0461c318ed68c2c0c2660736')
+sha1sums=('18ea33d8b9f858b6e735cc81af900f0eebee8d25'
+          '195b06e28e503f5e5ef355c3332884cc5e7954a9'
+          'b7819d725817e55b69c73e2572c21a05db48cc86'
+          '83c38ec40efb7cc09d9824b98e65cd948a195cc6'
+          'f34f60cb4fb1f4af7be7aca427cbad3cad22bbb9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr \
-    --mandir=/usr/share/man \
+    --libexecdir=/usr/lib \
     --disable-pam \
     --with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres \
     --sysconfdir=/etc \
@@ -41,12 +42,10 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   make DESTDIR="${pkgdir}" install
+  sed -i 's|nogroup|nobody|g' "${pkgdir}/etc/proftpd.conf"
+
   install -Dm644 ../proftpd.logrotate "${pkgdir}/etc/logrotate.d/proftpd"
   install -Dm644 ../proftpd.conf.d "${pkgdir}/etc/conf.d/proftpd"
   install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd"
   install -Dm755 contrib/xferstats.holger-preiss "${pkgdir}/usr/bin/ftpstats"
-
-  cd "${pkgdir}/etc"
-  sed -i 's|nogroup|nobody|g' proftpd.conf
-  rmdir "${pkgdir}/usr/libexec"
 }
diff --git a/extra/racket/PKGBUILD b/extra/racket/PKGBUILD
index 6115e03f3..0b203d599 100644
--- a/extra/racket/PKGBUILD
+++ b/extra/racket/PKGBUILD
@@ -1,22 +1,20 @@
-# $Id: PKGBUILD 135654 2011-08-17 02:18:35Z eric $
+# $Id: PKGBUILD 142774 2011-11-15 00:48:27Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=racket
-pkgver=5.1.3
+pkgver=5.2
 pkgrel=1
 pkgdesc="A programming language environment (formerly known as PLT Scheme) suitable for tasks ranging from scripting to application development"
 arch=('i686' 'x86_64')
 url="http://racket-lang.org/"
 license=('LGPL')
-depends=('gtk2' 'libffi' 'desktop-file-utils')
+depends=('gtk2' 'desktop-file-utils')
 makedepends=('gsfonts')
 options=('!strip')
 install=racket.install
 source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz \
         drracket.desktop)
-md5sums=('6c33caf6ee49a422be053effaf630941'
-         '9223c9736ead677431542b41271c7b3c')
-sha1sums=('7face74729cee8b36ce3df44b36b04ca23b4c986'
+sha1sums=('f88007c12d7e5f2773b122d3652c8cd1d15da8c3'
           'a20808f6b250225704856f82a544681a962a299d')
 
 build() {