From taru ¡÷ users.sourceforge.jp Mon May 2 15:26:37 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Mon, 2 May 2005 15:26:37 +0900 Subject: [Ultrapossum-cvs 1263] plugin/slapd 1.16,1.17,configure.in Message-ID: <20050502062637.74F032AC010@users.sourceforge.jp> =================================================================== RCS file: plugin/slapd/configure.in,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- plugin/slapd/configure.in 2005/03/21 16:12:44 1.16 +++ plugin/slapd/configure.in 2005/05/02 06:26:37 1.17 @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.50) -AC_INIT(ultrapossum-slapd, 0.0.4+2.2.20sb2, taru ¡÷ ultrapossum.org) -AM_INIT_AUTOMAKE(ultrapossum-slapd, 0.0.4+2.2.20sb2) +AC_INIT(ultrapossum-slapd, 0.0.4+2.2.20sb3, taru ¡÷ ultrapossum.org) +AM_INIT_AUTOMAKE(ultrapossum-slapd, 0.0.4+2.2.20sb3) AM_ULTRAPOSSUM_MODULE From taru ¡÷ users.sourceforge.jp Mon May 2 15:28:32 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Mon, 2 May 2005 15:28:32 +0900 Subject: [Ultrapossum-cvs 1264] plugin/slapd/debian 1.19,1.20,changelog Message-ID: <20050502062832.395E42AC010@users.sourceforge.jp> =================================================================== RCS file: plugin/slapd/debian/changelog,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- plugin/slapd/debian/changelog 2005/03/23 04:14:04 1.19 +++ plugin/slapd/debian/changelog 2005/05/02 06:28:32 1.20 @@ -1,3 +1,9 @@ +ultrapossum-slapd (0.0.4+2.2.20sb3-1) unstable; urgency=low + + * New upstream release. + + -- Masato Taruishi Mon, 2 May 2005 15:27:39 +0900 + ultrapossum-slapd (0.0.4+2.2.20sb2-3) unstable; urgency=low * Rebuilt against sarge. From taru ¡÷ users.sourceforge.jp Fri May 6 13:27:32 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Fri, 6 May 2005 13:27:32 +0900 Subject: [Ultrapossum-cvs 1265] plugin/slapd/upstream 1.5, 1.6, syncbackup-2.2.20.patch Message-ID: <20050506042732.CBE5E2AC012@users.sourceforge.jp> =================================================================== RCS file: plugin/slapd/upstream/syncbackup-2.2.20.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- plugin/slapd/upstream/syncbackup-2.2.20.patch 2005/05/02 06:26:37 1.5 +++ plugin/slapd/upstream/syncbackup-2.2.20.patch 2005/05/06 04:27:32 1.6 @@ -1910,7 +1910,7 @@ RCS file: openldap-2.2.20/servers/slapd/syncbackup.c diff -N openldap-2.2.20/servers/slapd/syncbackup.c --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ openldap-2.2.20/servers/slapd/syncbackup.c 2 May 2005 01:27:19 -0000 1.5 ++++ openldap-2.2.20/servers/slapd/syncbackup.c 6 May 2005 04:21:34 -0000 1.6 @@ -0,0 +1,2464 @@ +/* $OpenLDAP:$ */ +/* @@ -2691,7 +2691,7 @@ + Debug ( LDAP_DEBUG_TRACE, "backup_result: ldap_result timeout id=%s, start(%ld), now(%ld)\n", info->sbi_backups[id]->sb_syncid, otime, slap_get_time()); + (*waittime) *= 3; + (*waittime)++; -+ if( *waittime > 1000 ) *waittime = 1000; ++ if( *waittime > 1000000 ) *waittime = 1000000; + + goto done; + From taru ¡÷ users.sourceforge.jp Mon May 23 11:28:37 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Mon, 23 May 2005 11:28:37 +0900 Subject: [Ultrapossum-cvs 1266] projects/apache 1.2, 1.3, apache2_ssl.in 1.7, 1.8, update-apache Message-ID: <20050523022837.4D8B42AC011@users.sourceforge.jp> =================================================================== RCS file: projects/apache/apache2_ssl.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- projects/apache/apache2_ssl.in 2005/02/03 18:42:45 1.2 +++ projects/apache/apache2_ssl.in 2005/05/23 02:28:37 1.3 @@ -164,12 +164,12 @@ # mixture between C and Perl. See the mod_ssl documentation # for more details. # -#SSLRequire ( %{SSL_CIPHER} !~ m/^(EXP|NULL)/ \\ -# and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \\ -# and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \\ -# and %{TIME_WDAY} >= 1 and %{TIME_WDAY} <= 5 \\ -# and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 20 ) \\ -# or %{REMOTE_ADDR} =~ m/^192\\.76\\.162\\.[0-9]+$/ +#SSLRequire ( %{SSL_CIPHER} !~ m/^(EXP|NULL)/ \ +# and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \ +# and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \ +# and %{TIME_WDAY} >= 1 and %{TIME_WDAY} <= 5 \ +# and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 20 ) \ +# or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/ # # SSL Engine Options: @@ -204,7 +204,7 @@ # This enables optimized SSL connection renegotiation handling when SSL # directives are used in per-directory context. #SSLOptions +FakeBasicAuth +ExportCertData +CompatEnvVars +StrictRequire - + SSLOptions +StdEnvVars @@ -235,15 +235,15 @@ # Similarly, one has to force some clients to use HTTP/1.0 to workaround # their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and # "force-response-1.0" for this. -SetEnvIf User-Agent ".*MSIE.*" \\ - nokeepalive ssl-unclean-shutdown \\ +SetEnvIf User-Agent ".*MSIE.*" \ + nokeepalive ssl-unclean-shutdown \ downgrade-1.0 force-response-1.0 # Per-Server Logging: # The home of a custom SSL log file. Use this when you want a # compact non-error SSL logfile on a virtual host basis. -CustomLog /var/log/apache2/ssl_request_log \\ - "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \\"%r\\" %b" +CustomLog /var/log/apache2/ssl_request_log \ + "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b" =================================================================== RCS file: projects/apache/update-apache,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- projects/apache/update-apache 2005/02/03 18:42:45 1.7 +++ projects/apache/update-apache 2005/05/23 02:28:37 1.8 @@ -34,15 +34,14 @@ return fi else - if ! test -x "/usr/sbin/update-apache2-modules"; then + if ! test -x "/usr/sbin/a2enmod"; then return fi fi if test "x$APACHE_VHOSTS" != "x"; then if test "x$1" = "xapache2"; then - update-apache2-modules --add vhost_aliasa || true - update-apache2-modules --enable vhost_alias + a2enmod vhost_alias else apache-modconf "$1" enable mod_vhost_alias fi @@ -51,12 +50,10 @@ test -e "$TLSCERTIFICATEFILE" && test -e "$TLSCERTIFICATEKEYFILE" then - update-apache2-modules --add ssl || true - update-apache2-modules --enable ssl + a2enmod ssl fi if test "x$1" = "xapache2"; then - update-apache2-modules --add auth_ldap || true - update-apache2-modules --enable auth_ldap + a2enmod auth_ldap else apache-modconf "$1" enable auth_ldap fi @@ -104,9 +101,9 @@ then /bin/cp $tmp $tmp2 $SHAREDIR/sedwrap < "$APACHE2_SSLIN" >> $tmp2 - add_endmark "##" "$id" >> $tmp + add_endmark "##" "$id" >> $tmp2 fi - add_endmark "##" "$id" >> $tmp2 + add_endmark "##" "$id" >> $tmp for s in $APACHE_SUITES do