[arch-commits] Commit in pidgin/repos (3 files)
Dan McGee
dan at archlinux.org
Wed Jul 2 15:34:45 UTC 2008
Date: Wednesday, July 2, 2008 @ 11:34:45
Author: dan
Revision: 3971
Merged revisions 2525-3970 via svnmerge from
svn+ssh://archlinux.org/home/svn-packages/pidgin/trunk
........
r3970 | dan | 2008-07-02 10:34:28 -0500 (Wed, 02 Jul 2008) | 1 line
upgpkg: pidgin 2.4.3-1
........
Added:
pidgin/repos/extra-i686/certificate-location.patch
(from rev 3970, pidgin/trunk/certificate-location.patch)
Modified:
pidgin/repos/extra-i686/ (properties)
pidgin/repos/extra-i686/PKGBUILD
----------------------------+
PKGBUILD | 18 ++++++++++++------
certificate-location.patch | 13 +++++++++++++
2 files changed, 25 insertions(+), 6 deletions(-)
Property changes on: pidgin/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
- /pidgin/trunk:1-2524
+ /pidgin/trunk:1-3970
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2008-07-02 15:34:28 UTC (rev 3970)
+++ extra-i686/PKGBUILD 2008-07-02 15:34:45 UTC (rev 3971)
@@ -3,24 +3,29 @@
# Maintainer: Dan McGee <dan at archlinux.org>
pkgname=pidgin
-pkgver=2.4.2
+pkgver=2.4.3
pkgrel=1
pkgdesc="A GTK+-based messaging client"
arch=(i686 x86_64)
license=('GPL2')
url="http://pidgin.im"
-depends=('startup-notification' 'gtkspell' 'libxss' 'gstreamer0.10' 'dbus-glib>=0.73')
+depends=('startup-notification' 'gtkspell' 'libxss' 'gstreamer0.10'
+ 'dbus-glib>=0.73' 'ca-certificates')
makedepends=('pkgconfig' 'tk' 'avahi' 'intltool')
replaces=('gaim')
conflicts=('gaim')
provides=('gaim')
options=(!libtool)
install=pidgin.install
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
+ certificate-location.patch)
build() {
- cd ${startdir}/src/${pkgname}-${pkgver}
+ cd $srcdir/$pkgname-$pkgver
+ # patch to use system SSL certs
+ patch -Np0 < $srcdir/certificate-location.patch
+
# gconf won't die with the --disable-schemas-install option
sed -i -e 's/gconftool-2/no/g' configure.ac
@@ -41,7 +46,8 @@
--disable-meanwhile --disable-nm \
--disable-debug
make || return 1
- make DESTDIR=${startdir}/pkg install
+ make DESTDIR=$pkgdir install
}
-md5sums=('2d10f9b6a5f0162cf88016ea2ca0a36d')
+md5sums=('9e4a5f4ebda16a51fe91ec610286810a'
+ '773d1b944077d88a89bedc595d5f86b0')
Copied: pidgin/repos/extra-i686/certificate-location.patch (from rev 3970, pidgin/trunk/certificate-location.patch)
===================================================================
--- extra-i686/certificate-location.patch (rev 0)
+++ extra-i686/certificate-location.patch 2008-07-02 15:34:45 UTC (rev 3971)
@@ -0,0 +1,13 @@
+--- libpurple/certificate.c.old 2008-06-06 18:35:03.000000000 -0500
++++ libpurple/certificate.c 2008-06-06 18:58:32.000000000 -0500
+@@ -745,8 +745,8 @@
+ x509_ca_paths = g_list_append(NULL, g_build_filename(DATADIR,
+ "ca-certs", NULL));
+ #else
+- x509_ca_paths = g_list_append(NULL, g_build_filename(DATADIR,
+- "purple", "ca-certs", NULL));
++ x509_ca_paths = g_list_append(NULL, g_build_filename("/etc",
++ "ssl", "certs", NULL));
+ #endif
+ }
+
More information about the arch-commits
mailing list