OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 19-Jul-2008 22:15:26
Branch: HEAD Handle: 2008071921152500
Added files:
openpkg-src/apacheds apacheds-passwd.sh apacheds-tools.sh
Modified files:
openpkg-src/apacheds apacheds.patch apacheds.spec rc.apacheds
Removed files:
openpkg-src/apacheds apacheds-setup.sh
Log:
upgrading package: apacheds 1.5.1 -> 1.5.3
Summary:
Revision Changes Path
1.1 +31 -0 openpkg-src/apacheds/apacheds-passwd.sh
1.2 +0 -36 openpkg-src/apacheds/apacheds-setup.sh
1.1 +5 -0 openpkg-src/apacheds/apacheds-tools.sh
1.2 +42 -50 openpkg-src/apacheds/apacheds.patch
1.3 +26 -20 openpkg-src/apacheds/apacheds.spec
1.2 +9 -2 openpkg-src/apacheds/rc.apacheds
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apacheds/apacheds-passwd.sh
============================================================================
$ cvs diff -u -r0 -r1.1 apacheds-passwd.sh
--- /dev/null 2008-07-19 22:15:22 +0200
+++ apacheds-passwd.sh 2008-07-19 22:15:25 +0200
@@ -0,0 +1,31 @@
+#!/bin/sh
+##
+## apacheds-passwd.sh -- change the ApacheDS "admin" password
+##
+
+# command line argument
+if [ $# -ne 2 ]; then
+ echo "USAGE: apacheds-password <old-admin-password>
<new-admin-password>" 1>&2
+ exit 1
+fi
+password_old="$1"
+password_new="$2"
+
+# make sure OpenLDAP ldapmodify(1) is available
+if [ ! -x @l_prefix@/bin/ldapmodify ]; then
+ echo "$0:ERROR: sorry, automatic modification of the ApacheDS \"admin\"
password" 1>&2
+ echo "$0:ERRRO: requires the OpenLDAP ldapmodify(1) client utility to be
available." 1>&2
+ exit 1
+fi
+
+# change password in database by preparing an LDIF file
+# which is loading and removed on server startup
+( echo "dn: uid=admin,ou=system"
+ echo "changetype: modify"
+ echo "replace: userPassword"
+ echo "userPassword: $password_new"
+) | @l_prefix@/bin/ldapmodify \
+ -h 127.0.0.1 -p 10389 \
+ -D uid=admin,ou=system \
+ -x -w "$password_old"
+
@@ .
rm -f openpkg-src/apacheds/apacheds-setup.sh <<'@@ .'
Index: openpkg-src/apacheds/apacheds-setup.sh
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apacheds/apacheds-tools.sh
============================================================================
$ cvs diff -u -r0 -r1.1 apacheds-tools.sh
--- /dev/null 2008-07-19 22:15:22 +0200
+++ apacheds-tools.sh 2008-07-19 22:15:26 +0200
@@ -0,0 +1,5 @@
+#!/bin/sh
+exec @l_prefix@/bin/java \
+ -Vsun-jdk \
+ -jar @l_prefix@/libexec/apacheds/apacheds-tools.jar \
+ ${1+"$@"}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apacheds/apacheds.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 apacheds.patch
--- openpkg-src/apacheds/apacheds.patch 16 Sep 2007 18:51:25 -0000
1.1
+++ openpkg-src/apacheds/apacheds.patch 19 Jul 2008 20:15:25 -0000
1.2
@@ -1,51 +1,43 @@
-Index: server.xml
---- server.xml.orig 2007-09-01 09:46:04 +0200
-+++ server.xml 2007-09-16 20:01:40 +0200
-@@ -32,6 +32,7 @@
- <property name="enabled" value="false" />
- <!-- The port to run the Change Password protocol on.
-->
- <property name="ipPort" value="464" />
-+ <property name="ipAddress" value="127.0.0.1" />
- </bean>
-
- <bean id="ntpConfiguration"
class="org.apache.directory.server.ntp.NtpConfiguration">
-@@ -39,6 +40,7 @@
- <property name="enabled" value="false" />
- <!-- The port to run the NTP protocol on.
-->
- <property name="ipPort" value="123" />
-+ <property name="ipAddress" value="127.0.0.1" />
- </bean>
-
- <bean id="dnsConfiguration"
class="org.apache.directory.server.dns.DnsConfiguration">
-@@ -46,6 +48,7 @@
- <property name="enabled" value="false" />
- <!-- The port to run the DNS protocol on.
-->
- <property name="ipPort" value="53" />
-+ <property name="ipAddress" value="127.0.0.1" />
- </bean>
-
- <bean id="kdcConfiguration"
class="org.apache.directory.server.kerberos.kdc.KdcConfiguration">
-@@ -53,6 +56,7 @@
- <property name="enabled" value="false" />
- <!-- The port to run the Kerberos protocol on.
-->
- <property name="ipPort" value="88" />
-+ <property name="ipAddress" value="127.0.0.1" />
- </bean>
-
- <bean id="ldapsConfiguration"
class="org.apache.directory.server.ldap.LdapConfiguration">
-@@ -60,6 +64,7 @@
- <property name="enabled" value="false" />
- <!-- The port to run the LDAPS protocol on.
-->
- <property name="ipPort" value="636" />
-+ <property name="ipAddress" value="127.0.0.1" />
+Index: conf/server.xml
+--- conf/server.xml.orig 2008-07-13 22:10:54 +0200
++++ conf/server.xml 2008-07-19 21:28:30 +0200
+@@ -128,20 +128,20 @@
+ <socketAcceptor id="socketAcceptor" logicExecutor="#standardThreadPool"/>
- <property name="enableLdaps" value="true" />
- </bean>
-@@ -67,6 +72,7 @@
- <bean id="ldapConfiguration"
class="org.apache.directory.server.ldap.LdapConfiguration">
- <!-- The port to run the LDAP protocol on.
-->
- <property name="ipPort" value="10389" />
-+ <property name="ipAddress" value="127.0.0.1" />
- <!-- Whether to allow anonymous access.
-->
- <property name="allowAnonymousAccess" value="false" />
-
+ <!-- missing atou=users,dc=example,dc=com
+- <changePasswordServer ipPort="60464">
++ <changePasswordServer ipPort="60464" ipAddress="127.0.0.1">
+ <directoryService>#directoryService</directoryService>
+ <datagramAcceptor>#datagramAcceptor</datagramAcceptor>
+ <socketAcceptor>#socketAcceptor</socketAcceptor>
+ </changePasswordServer>
+ -->
+ <!-- missing atou=users,dc=example,dc=com
+- <kdcServer ipPort="60088">
++ <kdcServer ipPort="60088" ipAddress="127.0.0.1">
+ <directoryService>#directoryService</directoryService>
+ <datagramAcceptor>#datagramAcceptor</datagramAcceptor>
+ <socketAcceptor>#socketAcceptor</socketAcceptor>
+ </kdcServer>
+ -->
+- <ntpServer ipPort="60123">
++ <ntpServer ipPort="60123" ipAddress="127.0.0.1">
+ <datagramAcceptor>#datagramAcceptor</datagramAcceptor>
+ <socketAcceptor>#socketAcceptor</socketAcceptor>
+ </ntpServer>
+@@ -156,6 +156,7 @@
+ <ldapServer id="ldapsServer"
+ enabled="true"
+ ipPort="10636"
++ ipAddress="127.0.0.1"
+ enableLdaps="true">
+ <directoryService>#directoryService</directoryService>
+ <socketAcceptor>#socketAcceptor</socketAcceptor>
+@@ -164,6 +165,7 @@
+
+ <ldapServer id="ldapServer"
+ ipPort="10389"
++ ipAddress="127.0.0.1"
+ allowAnonymousAccess="false"
+ saslHost="ldap.example.com"
+ saslPrincipal="ldap/[EMAIL PROTECTED]"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apacheds/apacheds.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 apacheds.spec
--- openpkg-src/apacheds/apacheds.spec 1 Jan 2008 14:50:42 -0000
1.2
+++ openpkg-src/apacheds/apacheds.spec 19 Jul 2008 20:15:25 -0000
1.3
@@ -23,7 +23,7 @@
# package version
%define V_major 1.5
-%define V_minor 1
+%define V_minor 3
# package information
Name: apacheds
@@ -36,12 +36,13 @@
Group: LDAP
License: Apache
Version: %{V_major}.%{V_minor}
-Release: 20080101
+Release: 20080719
# list of sources
-Source0:
http://www.apache.org/dist/directory/apacheds/unstable/%{V_major}/%{V_major}.%{V_minor}/apacheds-noarch-%{V_major}.%{V_minor}.tar.gz
-Source1: apacheds-setup.sh
-Source2: rc.apacheds
+Source0:
http://www.apache.org/dist/directory/apacheds/unstable/%{V_major}/%{V_major}.%{V_minor}/apacheds-%{V_major}.%{V_minor}.tar.gz
+Source1: apacheds-tools.sh
+Source2: apacheds-passwd.sh
+Source3: rc.apacheds
Patch0: apacheds.patch
# build information
@@ -66,7 +67,7 @@
}
%prep
- %setup -q -n apacheds-noarch
+ %setup -q -c
%patch -p0
%build
@@ -88,20 +89,26 @@
%{l_shtool} install -c -m 644 \
-e 's;WARN, stdout, R;WARN, R;' \
-e 's;MaxBackupIndex=5;MaxBackupIndex=10;' \
- -e
's;apacheds-rolling\.log;%{l_prefix}/var/apacheds/log/apacheds-daemon.log;' \
- log4j.properties $RPM_BUILD_ROOT%{l_prefix}/etc/apacheds/
+ -e
's;apacheds-rolling\.log;%{l_prefix}/var/apacheds/log/apacheds.daemon.log;' \
+ conf/log4j.properties $RPM_BUILD_ROOT%{l_prefix}/etc/apacheds/
%{l_shtool} install -c -m 644 \
- -e 's;\(<property name="workingDirectory"
value="\)example\.com;\1%{l_prefix}/var/apacheds/db;' \
+ -e
's;\(workingDirectory="\)example\.com;\1%{l_prefix}/var/apacheds/db;' \
-e
's;<value>ldif</value>;<value>%{l_prefix}/etc/apacheds/ldif</value>;' \
- server.xml $RPM_BUILD_ROOT%{l_prefix}/etc/apacheds/
+ conf/server.xml $RPM_BUILD_ROOT%{l_prefix}/etc/apacheds/
+ %{l_shtool} install -c -m 644 \
+ conf/apacheds.conf $RPM_BUILD_ROOT%{l_prefix}/etc/apacheds/
# install program
%{l_shtool} install -c -m 755 \
- target/*.jar $RPM_BUILD_ROOT%{l_prefix}/libexec/apacheds/apacheds.jar
+ bin/*.jar lib/*.jar $RPM_BUILD_ROOT%{l_prefix}/libexec/apacheds/
+
+ # install tools script
+ %{l_shtool} install -c -m 755 %{l_value -s -a} \
+ %{SOURCE apacheds-tools.sh}
$RPM_BUILD_ROOT%{l_prefix}/sbin/apacheds-tools
- # install setup scripts
+ # install passwd script
%{l_shtool} install -c -m 755 %{l_value -s -a} \
- %{SOURCE apacheds-setup.sh}
$RPM_BUILD_ROOT%{l_prefix}/sbin/apacheds-setup
+ %{SOURCE apacheds-passwd.sh}
$RPM_BUILD_ROOT%{l_prefix}/sbin/apacheds-passwd
# install run-command script
%{l_shtool} install -c -m 755 %{l_value -s -a} \
@@ -128,13 +135,12 @@
echo ""
echo "For this connect to ApacheDS at 127.0.0.1:10389 and modify
the"
echo "\"userPassword\" field of the DN \"uid=admin,ou=system\"
with"
- echo "your preferred LDAP client. Additionally, store this
password"
- echo "into the file $RPM_INSTALL_PREFIX/etc/apacheds/server.xml"
- echo "under the poperty \"java.naming.security.credentials\"."
+ echo "your preferred LDAP client."
echo ""
echo "If you have OpenLDAP installed (even with
\"with_server=no\")"
echo "you can run the following command for an automated
procedure:"
- echo " \$ $RPM_INSTALL_PREFIX/sbin/apacheds-setup
<new-admin-password>"
+ echo " \$ $RPM_INSTALL_PREFIX/sbin/apacheds-passwd \\"
+ echo " \"setup\" \"<new-admin-password>\""
) | %{l_rpmtool} msg -b -t notice
elif [ $1 -eq 2 ]; then
# after upgrade, restart service
@@ -147,9 +153,9 @@
# before erase, stop service and remove log files
if [ $1 -eq 0 ]; then
%{l_rc} apacheds stop 2>/dev/null
- rm -f $RPM_INSTALL_PREFIX/var/apacheds/log/* >/dev/null 2>&1 || true
- rm -f $RPM_INSTALL_PREFIX/var/apacheds/run/* >/dev/null 2>&1 || true
- rm -rf $RPM_INSTALL_PREFIX/var/apacheds/db/* >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/apacheds/log/* >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/apacheds/run/* >/dev/null 2>&1 || true
+ rm -rf $RPM_INSTALL_PREFIX/var/apacheds/db/* >/dev/null 2>&1 || true
fi
exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apacheds/rc.apacheds
============================================================================
$ cvs diff -u -r1.1 -r1.2 rc.apacheds
--- openpkg-src/apacheds/rc.apacheds 16 Sep 2007 18:51:25 -0000 1.1
+++ openpkg-src/apacheds/rc.apacheds 19 Jul 2008 20:15:25 -0000 1.2
@@ -15,7 +15,7 @@
%common
apacheds_pidfile="@l_prefix@/var/apacheds/run/apacheds.pid"
- apacheds_logfile="@l_prefix@/var/apacheds/run/apacheds.console.log"
+ apacheds_logfile="@l_prefix@/var/apacheds/log/apacheds.console.log"
apacheds_signal () {
[ -f $apacheds_pidfile ] && kill -$1 `cat $apacheds_pidfile`
}
@@ -37,7 +37,14 @@
cmd="$cmd -server"
cmd="$cmd -Dlog4j.debug"
cmd="$cmd
-Dlog4j.configuration=file:@l_prefix@/etc/apacheds/log4j.properties"
- cmd="$cmd -jar @l_prefix@/libexec/apacheds/apacheds.jar"
+ cp=""
+ for jar in @l_prefix@/libexec/apacheds/*.jar; do
+ if [ ".$jar" = "[EMAIL
PROTECTED]@/libexec/apacheds/apacheds-tools.jar" ]; then continue; fi
+ if [ ".$cp" != . ]; then cp="$cp:"; fi
+ cp="$cp$jar"
+ done
+ cmd="$cmd -cp $cp"
+ cmd="$cmd org.apache.directory.server.UberjarMain"
cmd="$cmd $apacheds_flags"
cmd="$cmd @l_prefix@/etc/apacheds/server.xml"
( eval `JAVA_PLATFORM="sun-jdk" @l_prefix@/bin/java-toolkit -e`
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
