[phpldapadmin] update to the latest git source
Dmitry Butskoy
buc at fedoraproject.org
Tue Sep 18 12:43:09 UTC 2012
commit eaba7188eaf0fa7540d5059729a269e7e880a236
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date: Tue Sep 18 16:42:54 2012 +0400
update to the latest git source
.gitignore | 1 +
phpldapadmin-1.2.2-xss_query.patch | 34 ----------------------------------
phpldapadmin.spec | 15 +++++++++++----
sources | 2 +-
4 files changed, 13 insertions(+), 39 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 05f5be1..b0dde01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ phpldapadmin-1.2.0.5.tgz
/phpldapadmin-1.2.1.1.tgz
/phpldapadmin-1.2.1.1-20111006git.tgz
/phpldapadmin-1.2.2.tgz
+/phpldapadmin-1.2.2-bbedf1.tgz
diff --git a/phpldapadmin.spec b/phpldapadmin.spec
index 9c9a52c..ee08269 100644
--- a/phpldapadmin.spec
+++ b/phpldapadmin.spec
@@ -1,14 +1,19 @@
+%define git_commit bbedf1
Name: phpldapadmin
Summary: Web-based tool for managing LDAP servers
Version: 1.2.2
-Release: 2%{?dist}
+Release: 3.git%{git_commit}%{?dist}
Group: Applications/Internet
License: GPLv2+
URL: http://phpldapadmin.sourceforge.net
-Source: http://dl.sourceforge.net/sourceforge/phpldapadmin/phpldapadmin-%{version}.tgz
+
+# 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
+
Patch0: phpldapadmin-1.2.1.1-config.patch
-Patch1: phpldapadmin-1.2.2-xss_query.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -39,7 +44,6 @@ access by remote web-clients.
cp config/config.php.example config/config.php
%patch0 -p1
-%patch1 -p1
%build
@@ -118,6 +122,9 @@ fi
%changelog
+* 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)
+
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 7c383c7..eaea0e3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-78ca61eb5d7913963f8e42eb3b4f0e95 phpldapadmin-1.2.2.tgz
+5cc3844ad158c195b3f5a6a4f7e31b4d phpldapadmin-1.2.2-bbedf1.tgz
More information about the scm-commits
mailing list