packages: ldap-account-manager/configdir.patch, ldap-account-manager/ldap-a...
glen
glen at pld-linux.org
Tue May 1 22:12:37 CEST 2012
Author: glen Date: Tue May 1 20:12:37 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 3.7; ldap-account-manager-noanon.patch applied upstream
---- Files affected:
packages/ldap-account-manager:
configdir.patch (1.4 -> 1.5) , ldap-account-manager.spec (1.41 -> 1.42) , ldap-account-manager-noanon.patch (1.6 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/ldap-account-manager/configdir.patch
diff -u packages/ldap-account-manager/configdir.patch:1.4 packages/ldap-account-manager/configdir.patch:1.5
--- packages/ldap-account-manager/configdir.patch:1.4 Sat Feb 5 13:18:24 2011
+++ packages/ldap-account-manager/configdir.patch Tue May 1 22:12:31 2012
@@ -36,15 +36,15 @@
// set default values
$this->sessionTimeout = 30;
$this->logLevel = LOG_NOTICE;
---- ldap-account-manager-3.2.0/lib/account.inc~ 2011-02-05 13:52:09.000000000 +0200
-+++ ldap-account-manager-3.2.0/lib/account.inc 2011-02-05 13:52:47.408529134 +0200
-@@ -39,7 +39,7 @@
- * @return array list of shell names
+--- ldap-account-manager-3.7/lib/account.inc~ 2012-03-25 20:36:06.000000000 +0300
++++ ldap-account-manager-3.7/lib/account.inc 2012-05-01 21:02:42.263817208 +0300
+@@ -40,7 +40,7 @@
*/
function getshells() {
+ $return = array();
- $shellPath = dirname(__FILE__) . '/../config/shells';
+ $shellPath = '/etc/webapps/ldap-account-manager/shells';
- // Load shells from file
+ // load shells from file
if (file_exists($shellPath)) {
$shells = file($shellPath);
--- ldap-account-manager-2.8.0/lib/selfService.inc~ 2009-10-27 20:45:22.000000000 +0200
@@ -76,17 +76,17 @@
$file = @fopen($path, "w");
if ($file) {
// write settings to file
---- ldap-account-manager-2.8.0/lib/lamPDF.inc~ 2009-10-27 20:45:22.000000000 +0200
-+++ ldap-account-manager-2.8.0/lib/lamPDF.inc 2009-11-02 14:16:14.614959661 +0200
-@@ -87,7 +87,7 @@
+--- ldap-account-manager-3.7/lib/lamPDF.inc~ 2012-03-25 20:36:06.000000000 +0300
++++ ldap-account-manager-3.7/lib/lamPDF.inc 2012-05-01 21:03:33.675985875 +0300
+@@ -92,7 +92,7 @@
*/
function header() {
if($this->page_definitions['filename'] != 'none') {
- $imageFile = substr(__FILE__,0,strlen(__FILE__)- 14) . "config/pdf/logos/" . $this->page_definitions['filename'];
+ $imageFile = "/etc/webapps/ldap-account-manager/pdf/logos/" . $this->page_definitions['filename'];
- $width = $this->page_definitions['logo-width'];
- $height = $this->page_definitions['logo-height'];
- if($this->page_definitions['logo-max'] == true) {
+ $imgProperties = getimagesize($imageFile);
+ $this->Image($imageFile,10,15,($imgProperties[0] / $this->k) / 5, ($imgProperties[1] / $this->k) / 5,0,"JPG");
+ }
--- ldap-account-manager-2.8.0/lib/profiles.inc~ 2009-10-27 20:45:22.000000000 +0200
+++ ldap-account-manager-2.8.0/lib/profiles.inc 2009-11-02 14:17:06.030616922 +0200
@@ -36,7 +36,7 @@
@@ -185,19 +185,19 @@
if(is_file($languagefile) == True)
{
$file = fopen($languagefile, "r");
---- ldap-account-manager-2.8.0/templates/config/confmain.php~ 2009-10-27 20:46:33.000000000 +0200
-+++ ldap-account-manager-2.8.0/templates/config/confmain.php 2009-11-02 14:19:29.863970973 +0200
-@@ -326,7 +326,7 @@
- echo ("<tr>");
- echo ("<td><b>" . _("Default language") . ":</b></td><td>\n");
+--- ldap-account-manager-3.7/templates/config/confmain.php~ 2012-03-25 20:36:06.000000000 +0300
++++ ldap-account-manager-3.7/templates/config/confmain.php 2012-05-01 21:04:26.974900799 +0300
+@@ -258,7 +258,7 @@
+ // language
+ $languageSettingsContent = new htmlTable();
// read available languages
-$languagefile = "../../config/language";
+$languagefile = "/etc/webapps/ldap-account-manager/language";
- if(is_file($languagefile))
- {
+ if(is_file($languagefile)) {
$file = fopen($languagefile, "r");
---- ldap-account-manager-3.2.0/templates/config/profmanage.php~ 2011-02-05 13:56:45.000000000 +0200
-+++ ldap-account-manager-3.2.0/templates/config/profmanage.php 2011-02-05 13:59:05.947667191 +0200
+ while(!feof($file)) {
+--- ldap-account-manager-3.7/templates/config/profmanage.php~ 2012-05-01 21:01:16.000000000 +0300
++++ ldap-account-manager-3.7/templates/config/profmanage.php 2012-05-01 21:26:08.733146514 +0300
@@ -103,14 +103,14 @@
// check profile password
if ($_POST['addpassword'] && $_POST['addpassword2'] && ($_POST['addpassword'] == $_POST['addpassword2'])) {
@@ -218,12 +218,11 @@
if ($file) {
// load as config and write new password
$conf = new LAMConfig($_POST['addprofile']);
-@@ -130,8 +130,8 @@
+@@ -88,7 +88,8 @@
// rename profile
elseif ($_POST['action'] == "rename") {
- if (preg_match("/^[a-z0-9_-]+$/i", $_POST['renfilename']) && !in_array($_POST['renfilename'], getConfigProfiles())) {
-- if (rename("../../config/" . $_POST['oldfilename'] . ".conf",
-- "../../config/" . $_POST['renfilename'] . ".conf")) {
+ if (preg_match("/^[a-z0-9_-]+$/i", $_POST['oldfilename']) && preg_match("/^[a-z0-9_-]+$/i", $_POST['renfilename']) && !in_array($_POST['renfilename'], getConfigProfiles())) {
+- if (rename("../../config/" . $_POST['oldfilename'] . ".conf", "../../config/" . $_POST['renfilename'] . ".conf")) {
+ if (rename("/etc/webapps/ldap-account-manager/" . $_POST['oldfilename'] . ".conf",
+ "/etc/webapps/ldap-account-manager/" . $_POST['renfilename'] . ".conf")) {
$msg = _("Renamed profile.");
================================================================
Index: packages/ldap-account-manager/ldap-account-manager.spec
diff -u packages/ldap-account-manager/ldap-account-manager.spec:1.41 packages/ldap-account-manager/ldap-account-manager.spec:1.42
--- packages/ldap-account-manager/ldap-account-manager.spec:1.41 Sat Feb 5 13:18:24 2011
+++ packages/ldap-account-manager/ldap-account-manager.spec Tue May 1 22:12:31 2012
@@ -1,24 +1,25 @@
# $Revision$, $Date$
# TODO
# - ldap schema package: docs/schema/dhcp.schema
+# - system fpdf
+# - system seclib
%include /usr/lib/rpm/macros.perl
Summary: Administration of LDAP users, groups and hosts via Web GUI
Summary(de.UTF-8): Administration von Benutzern, Gruppen und Hosts für LDAP-Server
Summary(pl.UTF-8): LDAP Account Manager (LAM) - interfejs WWW do zarządzania kontami na serwerze LDAP
Name: ldap-account-manager
-Version: 3.2.0
-Release: 0.1
+Version: 3.7
+Release: 1
License: GPL v2+
Group: Applications/WWW
-Source0: http://dl.sourceforge.net/lam/%{name}-%{version}.tar.gz
-# Source0-md5: 2e447e81fccb9c35aa0fdee29ce9081d
+Source0: http://downloads.sourceforge.net/lam/%{name}-%{version}.tar.gz
+# Source0-md5: 75504a4131632a20d5551649f5da4a0e
Source1: apache.conf
Source2: lighttpd.conf
URL: http://lam.sourceforge.net/
Patch0: configdir.patch
Patch1: loginbysearch.patch
Patch2: %{name}-shadowAccount.patch
-Patch4: %{name}-noanon.patch
BuildRequires: perl-base
BuildRequires: rpm-perlprov
BuildRequires: rpmbuild(macros) >= 1.268
@@ -27,11 +28,13 @@
Requires: php-gettext
Requires: php-hash
Requires: php-iconv
+Requires: php-json
Requires: php-ldap
Requires: php-pcre
Requires: php-session
Requires: php-spl
Requires: php-xml
+Requires: php-zip
Requires: webapps
Requires: webserver(access)
Requires: webserver(alias)
@@ -134,10 +137,9 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch4 -p1
-cp -a config/config.cfg{_sample,}
-cp -a config/lam.conf{_sample,}
+cp -p config/config.cfg{_sample,}
+cp -p config/lam.conf{_sample,}
mv config/*_sample .
find -name .htaccess | xargs rm
@@ -158,9 +160,9 @@
# config
mv $RPM_BUILD_ROOT{%{_appdir}/config/*,%{_sysconfdir}}
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
-cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
# apidocs
mv $RPM_BUILD_ROOT{%{_appdir}/docs/devel,%{_phpdocdir}/%{name}/devel}
@@ -219,7 +221,7 @@
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lighttpd.conf
%attr(660,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/config.cfg
%attr(660,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lam.conf
-%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/passwordMailTemplate.txt
+#%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/passwordMailTemplate.txt
%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/shells
%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/language
%dir %attr(750,root,http) %{_sysconfdir}/pdf
@@ -257,6 +259,7 @@
%lang(ru) %{_appdir}/locale/ru_RU
%lang(zh_CN) %{_appdir}/locale/zh_CN
%lang(zh_TW) %{_appdir}/locale/zh_TW
+%lang(sk) %{_appdir}/locale/sk_SK
%dir %dir %attr(750,root,http) /var/lib/%{name}
%dir %attr(770,root,http) /var/lib/%{name}/sess
@@ -279,6 +282,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.42 2012/05/01 20:12:31 glen
+- up to 3.7; ldap-account-manager-noanon.patch applied upstream
+
Revision 1.41 2011/02/05 12:18:24 glen
- up to 3.2.0, updated patches, sizelimit like solution already upstream
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/ldap-account-manager/configdir.patch?r1=1.4&r2=1.5
http://cvs.pld-linux.org/packages/ldap-account-manager/ldap-account-manager.spec?r1=1.41&r2=1.42
More information about the pld-cvs-commit
mailing list