From: Jeremy Huddleston Date: Sat, 24 Sep 2005 23:38:37 +0000 (+0000) Subject: Added patch for login.pm when USE=ssl. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=31b348cc2ccf8182c7e9df0659570e00cdd844c8;p=gentoo.git Added patch for login.pm when USE=ssl. Package-Manager: portage-2.0.52-r1 --- diff --git a/www-apps/open-xchange/ChangeLog b/www-apps/open-xchange/ChangeLog index e58bef994a7d..cb4b2c12ecb7 100644 --- a/www-apps/open-xchange/ChangeLog +++ b/www-apps/open-xchange/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-apps/open-xchange # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/open-xchange/ChangeLog,v 1.2 2005/09/24 20:38:54 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/open-xchange/ChangeLog,v 1.3 2005/09/24 23:38:37 eradicator Exp $ + + 24 Sep 2005; Jeremy Huddleston + +files/open-xchange-0.8.1.2-login.patch, open-xchange-0.8.1.2.ebuild: + Added patch for login.pm when USE=ssl. 24 Sep 2005; Jeremy Huddleston files/slapd.ox.inc: Fixed up the slapd permissions include. diff --git a/www-apps/open-xchange/Manifest b/www-apps/open-xchange/Manifest index c85679ee498b..06a033dd4460 100644 --- a/www-apps/open-xchange/Manifest +++ b/www-apps/open-xchange/Manifest @@ -1,18 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 aa333946b92b009f73c374ceeb7c33f0 open-xchange-0.8.1.2.ebuild 21555 +MD5 8f171840a34ecf92614bd53fb27b4414 open-xchange-0.8.1.2.ebuild 21691 MD5 59d559390ca6a6d365a5d6c3012c0343 metadata.xml 387 -MD5 3763a6f30682cee252c57a59b68f7585 ChangeLog 719 +MD5 c2f6e496321314528148a8c0d02dd66a ChangeLog 890 MD5 2ad5cb7b97eca4314016247cde421449 files/slapd.ox.inc 2019 MD5 ec8d72f6da3dbefde48787a53fa071bf files/digest-open-xchange-0.8.1.2 138 MD5 5388f979621c5e4d333aef5cd37f0062 files/init.d.open-xchange 1877 MD5 cfa72c4f5e62b779052acf1cd629234b files/88_mod_jk.ox.conf 1228 MD5 7d1504e4241974d3583575b3827b0f5a files/open-xchange-htaccess 174 +MD5 b9bb53f0dd8125a862c1cbc45ab7c06f files/open-xchange-0.8.1.2-login.patch 638 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDNdBxArHZZzCEUG0RAoV3AJ0XL/2Dipg7J7qJKZHEi5DUZOCTmQCcDCkl -p0ykxJOHXrVrxu6BfS3GoqY= -=115I +iD8DBQFDNeONArHZZzCEUG0RAmOgAJ9v8ugwOryrLDSwFWAR3Y7zqwtSiACcCCYx +IQMGmjCrH9U7QjWEwyuw7Aw= +=ffGp -----END PGP SIGNATURE----- diff --git a/www-apps/open-xchange/files/open-xchange-0.8.1.2-login.patch b/www-apps/open-xchange/files/open-xchange-0.8.1.2-login.patch new file mode 100644 index 000000000000..dd032e47c765 --- /dev/null +++ b/www-apps/open-xchange/files/open-xchange-0.8.1.2-login.patch @@ -0,0 +1,14 @@ +--- src/misc/login/login.pm.in.orig 2005-08-26 17:08:58.000000000 +0200 ++++ src/misc/login/login.pm.in 2005-09-25 00:34:39.000000000 +0200 +@@ -28,9 +28,9 @@ + # SSL + my $ssl_key_file = '@oxgroupwaresysconfdir@/sslcerts/oxCERTS/groupwarekey.pem'; + my $ssl_cert_file = '@oxgroupwaresysconfdir@/sslcerts/oxCERTS/groupwarecert.pem'; +-my $ssl_ca_file = '@oxgroupwaresysconfdir@/sslcerts/oxCA/cacert.pem '; ++my $ssl_ca_file = '@oxgroupwaresysconfdir@/sslcerts/oxCA/cacert.pem'; + my $ssl_use_cert = 1; +-my $ssl_verify_mode = '0x01'; ++my $ssl_verify_mode = 0x01; + # LDAP + #my $scope = 'one'; + #my $ldap_conf = '@oxgroupwaresysconfdir@/ldap.conf'; diff --git a/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild b/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild index d0e0d527ae7b..a46c583b5a9c 100644 --- a/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild +++ b/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild,v 1.2 2005/09/24 10:38:00 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild,v 1.3 2005/09/24 23:38:37 eradicator Exp $ inherit eutils webapp ssl-cert toolchain-funcs java-pkg versionator depend.apache @@ -69,7 +69,10 @@ src_unpack() { unpack ${A} cd ${S} - # reported bug at open-xchang.org #656 + # http://www.open-xchange.org/cgi-bin/bugzilla/show_bug.cgi?id=734 + epatch ${FILESDIR}/${P}-login.patch + + # http://www.open-xchange.org/cgi-bin/bugzilla/show_bug.cgi?id=656 sed -i "s|\${DESTDIR}|\$(DESTDIR)|g" Makefile.am export WANT_AUTOMAKE=1.8