[phpldapadmin/f18] update to 1.2.3
Dmitry Butskoy
buc at fedoraproject.org
Wed Oct 31 13:06:54 UTC 2012
commit 64b78cabf4a957af2273bcd8d78479121f0121d8
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date: Wed Oct 31 17:06:46 2012 +0400
update to 1.2.3
phpldapadmin.spec | 29 ++++++++++++++++++-----------
sources | 2 +-
2 files changed, 19 insertions(+), 12 deletions(-)
---
diff --git a/phpldapadmin.spec b/phpldapadmin.spec
index ee08269..173c0c2 100644
--- a/phpldapadmin.spec
+++ b/phpldapadmin.spec
@@ -1,17 +1,13 @@
-%define git_commit bbedf1
Name: phpldapadmin
Summary: Web-based tool for managing LDAP servers
-Version: 1.2.2
-Release: 3.git%{git_commit}%{?dist}
+Version: 1.2.3
+Release: 1%{?dist}
Group: Applications/Internet
License: GPLv2+
URL: http://phpldapadmin.sourceforge.net
-# git clone git://git.code.sf.net/p/phpldapadmin/code phpldapadmin-code
-# mv phpldapadmin-code phpldapadmin-%{version}
-# tar -cvf - phpldapadmin-%{version} | gzip -c -9 >phpldapadmin-%{version}-%{git_commit}.tgz
-Source: http://dl.sourceforge.net/sourceforge/phpldapadmin/phpldapadmin-%{version}-%{git_commit}.tgz
+Source: http://dl.sourceforge.net/sourceforge/phpldapadmin/phpldapadmin-%{version}.tgz
Patch0: phpldapadmin-1.2.1.1-config.patch
@@ -86,10 +82,17 @@ Alias /%{name} %{_datadir}/%{name}/htdocs
Alias /ldapadmin %{_datadir}/%{name}/htdocs
<Directory %{_datadir}/%{name}/htdocs>
- Order Deny,Allow
- Deny from all
- Allow from 127.0.0.1
- Allow from ::1
+ <IfModule mod_authz_core.c>
+ # Apache 2.4
+ Require local
+ </IfModule>
+ <IfModule !mod_authz_core.c>
+ # Apache 2.2
+ Order Deny,Allow
+ Deny from all
+ Allow from 127.0.0.1
+ Allow from ::1
+ </IfModule>
</Directory>
EOF
@@ -122,6 +125,10 @@ fi
%changelog
+* Wed Oct 31 2012 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.2.3-1
+- update to 1.2.3
+- fix apache config file (#871457)
+
* Tue Sep 18 2012 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.2.2-3.gitbbedf1
- update to latest git source (CVE-2012-1114, CVE-2012-1115, #799873)
diff --git a/sources b/sources
index eaea0e3..2e314cf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5cc3844ad158c195b3f5a6a4f7e31b4d phpldapadmin-1.2.2-bbedf1.tgz
+59a49054039ceb852c2da377d8742360 phpldapadmin-1.2.3.tgz
More information about the scm-commits
mailing list