update to 7.7 [release 7.7-1mamba;Wed Dec 01 2021]

This commit is contained in:
Silvan Calarco 2024-01-06 03:34:16 +01:00
parent 754a8d873b
commit 5f8a57fd09
3 changed files with 73 additions and 89 deletions

View File

@ -1,24 +0,0 @@
--- ldap-account-manager-3.3.0.orig/Makefile.in 2011-02-12 16:36:45.000000000 +0100
+++ ldap-account-manager-3.3.0/Makefile.in 2011-03-15 15:48:16.021819782 +0100
@@ -24,7 +24,7 @@
sysconfdir=@sysconfdir@
localstatedir=@localstatedir@
mandir=@mandir@
-htmldir=@prefix@/html
+htmldir=@datadir@/doc/html/lam
web_root=@WEB_ROOT@
srcdir=@srcdir@
@@ -73,9 +73,9 @@
(cd $(DESTDIR)$(sysconfdir) ; $(TAR) xf -) ; \
$(LN_S) $(sysconfdir) ${LIST3} ; \
(cd $(srcdir) ; $(TAR) cf - $(LIST1)) | $(TAR) xf - ; \
- [ -d $(DESTDIR)$(prefix)/docs ] || \
- $(MKDIR) -p $(DESTDIR)$(prefix)/docs || exit 1 ; \
- (cd $(srcdir) ; $(COPY) $(DOCS) $(DESTDIR)$(prefix)/docs) ; \
+ [ -d $(DESTDIR)$(htmldir) ] || \
+ $(MKDIR) -p $(DESTDIR)$(htmldir) || exit 1 ; \
+ (cd $(srcdir) ; $(COPY) $(DOCS) $(DESTDIR)$(htmldir)) ; \
$(PERL) -pi -e "s~/usr/bin/perl~$(PERL)~" \
$(DESTDIR)$(web_root)/lib/lamdaemon.pl ; \
cd $${HERE} ; \

View File

@ -0,0 +1,15 @@
--- ldap-account-manager-7.7/Makefile.in.orig 2021-12-07 16:20:53.972739309 +0100
+++ ldap-account-manager-7.7/Makefile.in 2021-12-07 16:22:41.201671545 +0100
@@ -74,9 +74,9 @@
(cd $(DESTDIR)$(sysconfdir) ; $(TAR) xf -) ; \
[ -e ${LIST3} ] || $(LN_S) $(sysconfdir) ${LIST3} ; \
(cd $(srcdir) ; $(TAR) cf - $(LIST1)) | $(TAR) xf - ; \
- [ -d $(DESTDIR)$(prefix)/docs ] || \
- $(MKDIR) -p $(DESTDIR)$(prefix)/docs || exit 1 ; \
- (cd $(srcdir) ; $(COPY) $(DOCS) $(DESTDIR)$(prefix)/docs) ; \
+ [ -d $(DESTDIR)$(docdir) ] || \
+ $(MKDIR) -p $(DESTDIR)$(docdir) || exit 1 ; \
+ (cd $(srcdir) ; $(COPY) $(DOCS) $(DESTDIR)$(docdir)) ; \
$(PERL) -pi -e "s~/usr/bin/perl~$(PERL)~" \
$(DESTDIR)$(web_root)/lib/lamdaemon.pl ; \
cd $${HERE} ; \

View File

@ -23,21 +23,20 @@
#% define rcver_append .RC1
Name: ldap-account-manager
Version: 3.9
Release: 2mamba
Version: 7.7
Release: 1mamba
Summary: A webfrontend for managing accounts stored in an openLDAP server.
Group: Applications/Web
Vendor: openmamba
Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://lam.sourceforge.net/
Source: http://downloads.sourceforge.net/sourceforge/lam/ldap-account-manager-%{version}%{?rcver_append}.tar.gz
Patch0: %{name}-3.3.0-installdirs.patch
Source: https://sourceforge.net/projects/lam/files/LAM/%{version}/ldap-account-manager-%{version}.tar.bz2
Patch0: %{name}-7.7-installdirs.patch
Patch1: %{name}-3.3.0-sync_ldap_names_with_smbldaptools.patch
Patch2: %{name}-3.3.0-default_user_profile.patch
License: GPL
## AUTOBUILDREQ-BEGIN
BuildRequires: perl-devel
## AUTOBUILDREQ-END
BuildRequires: apache
Requires: apache >= 2.0.48
@ -47,8 +46,7 @@ Requires: php >= 4.3.6
Requires: php-ldap >= 4.3.6
#Requires: ldap-scripts
Provides: lam
Obsoletes: lam
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Obsoletes: lam <= 3.9
BuildArch: noarch
%description
@ -72,13 +70,14 @@ Features:
%prep
%setup -q -n ldap-account-manager-%{version}%{?rcver_append}
%patch0 -p1
%patch1 -p1
%patch2 -p1
#%patch1 -p1
#%patch2 -p1
%build
%configure \
--sysconfdir=%{_sysconfdir}/lam \
--localstatedir=%{_localstatedir}/lam \
--docdir=%{_docdir}/lam \
--htmldir=%{_docdir}/html/lam \
--with-httpd-user=httpd \
--with-httpd-group=nobody \
@ -88,97 +87,91 @@ Features:
%install
%makeinstall
#mkdir -p %{buildroot}/var/www/html/lam
#install -m 0644 index.html %{buildroot}/var/www/html/lam
#cp -R config lib sess tmp graphics locale style help templates %{buildroot}/var/www/html/lam
mv %{buildroot}%{_sysconfdir}/lam/config.cfg_sample %{buildroot}%{_sysconfdir}/lam/config.cfg
mv %{buildroot}%{_sysconfdir}/lam/lam.conf_sample %{buildroot}%{_sysconfdir}/lam/lam.conf
mv %{buildroot}%{_sysconfdir}/lam/config.cfg.sample %{buildroot}%{_sysconfdir}/lam/config.cfg
#mv %{buildroot}%{_sysconfdir}/lam/lam.conf_sample %{buildroot}%{_sysconfdir}/lam/lam.conf
mkdir -p %{buildroot}%{_datadir}/applications
cat > %{buildroot}%{_datadir}/applications/lam.desktop << EOF
[Desktop Entry]
Name=LDAP Account Manager
Comment=LDAP Account Manager
Exec=konqueror http://localhost/lam
Type=Application
Terminal=0
Icon=personal
Categories=Application;System;
EOF
install -d -m0755 %{buildroot}%{_docdir}
mv %{buildroot}%{_prefix}/docs %{buildroot}%{_docdir}/lam
%clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%post
if [ $1 -eq 1 ]; then
# new install
[ -e %{_sysconfdir}/openldap/slapd.conf ] && {
eval suffix=`grep ^suffix %{_sysconfdir}/openldap/slapd.conf | awk '{ print $2 }'`
eval rootdn=`grep ^rootdn %{_sysconfdir}/openldap/slapd.conf | awk '{ print $2 }'`
}
[ "$suffix" -a "$rootdn" ] && {
sed -i "s|cn=Manager,dc=my-domain,dc=com|$rootdn|
s|#treesuffix: dc=yourdomain,dc=org|treesuffix: $suffix|
s|dc=my-domain,dc=com|$suffix|" \
%{_sysconfdir}/lam/lam.conf
}
# RANDOM_PASSWD=`%{_bindir}/mkpasswd -l 8 -s 0`
# sed -i "s|^passwd: lam|passwd: $RANDOM_PASSWD|" \
# %{_localstatedir}/www/html/lam/config/lam.conf
fi
:
#%post
#if [ $1 -eq 1 ]; then
## new install
# [ -e %{_sysconfdir}/openldap/slapd.conf ] && {
# eval suffix=`grep ^suffix %{_sysconfdir}/openldap/slapd.conf | awk '{ print $2 }'`
# eval rootdn=`grep ^rootdn %{_sysconfdir}/openldap/slapd.conf | awk '{ print $2 }'`
# }
# [ "$suffix" -a "$rootdn" ] && {
# sed -i "s|cn=Manager,dc=my-domain,dc=com|$rootdn|
# s|#treesuffix: dc=yourdomain,dc=org|treesuffix: $suffix|
# s|dc=my-domain,dc=com|$suffix|" \
# %{_sysconfdir}/lam/lam.conf
# }
## RANDOM_PASSWD=`%{_bindir}/mkpasswd -l 8 -s 0`
## sed -i "s|^passwd: lam|passwd: $RANDOM_PASSWD|" \
## %{_localstatedir}/www/html/lam/config/lam.conf
#fi
#:
%files
%defattr(-,root,root)
%dir %{_sysconfdir}/lam
%{_sysconfdir}/lam/addressbook.sample.conf
%{_sysconfdir}/lam/samba3.sample.conf
%{_sysconfdir}/lam/unix.sample.conf
%{_sysconfdir}/lam/windows_samba4.sample.conf
%config(noreplace) %{_sysconfdir}/lam/config.cfg
%config(noreplace) %{_sysconfdir}/lam/lam.conf
#%config(noreplace) %{_sysconfdir}/lam/lam.conf
%dir %{_sysconfdir}/lam/selfService
%{_sysconfdir}/lam/selfService/.htaccess
%{_sysconfdir}/lam/selfService/*
%dir %{_sysconfdir}/lam/language
%dir %{_sysconfdir}/lam/pdf
%{_sysconfdir}/lam/pdf/.htaccess
%{_sysconfdir}/lam/pdf/*
%attr(0755,apache,apache) %dir %{_sysconfdir}/lam/profiles
%{_sysconfdir}/lam/profiles/.htaccess
%config(noreplace) %attr(0755,apache,apache) %{_sysconfdir}/lam/profiles/*
%dir %{_sysconfdir}/lam/shells
%{_sysconfdir}/lam/selfService/.placeholder
%dir %{_sysconfdir}/lam/templates
%dir %{_sysconfdir}/lam/templates/pdf
%{_sysconfdir}/lam/templates/pdf/*
%dir %{_sysconfdir}/lam/templates/profiles
%{_sysconfdir}/lam/templates/profiles/*
%config(noreplace) %{_sysconfdir}/lam/language
%{_sysconfdir}/lam/.htaccess
#%{_sysconfdir}/lam/passwordMailTemplate.txt
%dir %attr(0755,apache,apache) %{installdir}
%{installdir}/index.html
%dir %attr(0755,apache,nobody) %{installdir}
%{installdir}/config
%dir %attr(0755,apache,apache) %{installdir}/lib
%{installdir}/index.html
%{installdir}/pwa_worker.js
%dir %attr(0755,apache,nobody) %{installdir}/lib
%{installdir}/lib/.htaccess
%{installdir}/lib/*
%dir %attr(0755,apache,apache) %{installdir}/graphics
%dir %attr(0755,apache,nobody) %{installdir}/graphics
%{installdir}/graphics/.htaccess
%{installdir}/graphics/*
%dir %attr(0755,apache,apache) %{installdir}/help
%dir %attr(0755,apache,nobody) %{installdir}/help
%{installdir}/help/.htaccess
%{installdir}/help/*
%dir %attr(0755,apache,apache) %{installdir}/locale
%dir %attr(0755,apache,nobody) %{installdir}/locale
%{installdir}/locale/.htaccess
%{installdir}/locale/*/LC_MESSAGES/messages.*
%{installdir}/sess
%dir %attr(0755,apache,apache) %{installdir}/style
%dir %attr(0755,apache,nobody) %{installdir}/style
%{installdir}/style/.htaccess
%{installdir}/style/*
%dir %attr(0755,apache,apache) %{installdir}/templates
%dir %attr(0755,apache,nobody) %{installdir}/templates
%{installdir}/templates/.htaccess
%{installdir}/templates/*
%{installdir}/tmp
%{installdir}/VERSION
%{_datadir}/applications/lam.desktop
%attr(0750,apache,nobody) %{_localstatedir}/lam/sess
%attr(0750,apache,nobody) %{_localstatedir}/lam/tmp
%dir %{_docdir}/html/lam
%{_docdir}/html/lam/*
%dir %{_docdir}/lam
%{_docdir}/lam/*
%doc COPYING
#HISTORY README
%changelog
* Wed Dec 01 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 7.7-1mamba
- update to 7.7
* Wed Feb 06 2013 Silvan Calarco <silvan.calarco@mambasoft.it> 3.9-2mamba
- fix apxs path
@ -241,5 +234,5 @@ fi
- added KDE menu entry
- fixed lam.conf with QiLinux default limits for UID and GID
* Wed May 06 2004 Silvan Calarco <silvan.calarco@mambasoft.it> 0.4.5-1qilnx
* Thu May 06 2004 Silvan Calarco <silvan.calarco@mambasoft.it> 0.4.5-1qilnx
- first build