[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gforge-commits] gforge/debian rules, 1.68, 1.69 gforge-web-apache.posti
From: |
lo-lan-do |
Subject: |
[Gforge-commits] gforge/debian rules, 1.68, 1.69 gforge-web-apache.postinst.dsfh-in, 1.8, 1.9 gforge-ldap-openldap.postinst.dsfh-in, 1.9, 1.10 gforge-db-postgresql.cron.d, 1.5, 1.6 control, 1.51, 1.52 changelog, 1.358, 1.359 |
Date: |
Sat, 10 Jan 2004 16:14:08 -0600 |
Update of /cvsroot/gforge/gforge/debian
In directory db.perdue.net:/tmp/cvs-serv23776/debian
Modified Files:
rules gforge-web-apache.postinst.dsfh-in
gforge-ldap-openldap.postinst.dsfh-in
gforge-db-postgresql.cron.d control changelog
Log Message:
Merging Branch_3_1 back into the trunk (at tag Branch_3_1-merge_3).
Index: rules
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/rules,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- rules 18 Dec 2003 21:11:56 -0000 1.68
+++ rules 10 Jan 2004 22:14:05 -0000 1.69
@@ -109,6 +109,7 @@
#NOT USED#install -m 644 db/user_rating.sql
$(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/db/
install -m 644 deb-specific/sf-2.6-complete.sql
$(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/db/
install -m 644 deb-specific/sf2.5-to-sf2.6.sql
$(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/db/
+
install -m 755 cronjobs/db_trove_maint.php
$(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
install -m 755 cronjobs/project_cleanup.php
$(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
#install -m 755 cronjobs/project_metric.php
$(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
@@ -122,8 +123,10 @@
install -m 755 cronjobs/rotate_activity.php
$(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
install -m 755 cronjobs/db_project_sums.php
$(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
install -m 755 cronjobs/check_stale_tracker_items.php
$(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
+ install -m 755 cronjobs/massmail.php
$(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
#GF install -m 755 cronjobs/stats/include/stats_site.inc
$(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/lib/
#GF install -m 755 cronjobs/stats/include/stats_projects.inc
$(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/lib/
+
#GF install utils/underworld-root/db_top_groups_calc.pl
$(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/db_top_groups_calc.pl
#install utils/underworld-root/stats_nightly.sh
$(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/stats_nightly.sh
#install utils/underworld-root/db_stats_prepare.pl
$(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/db_stats_prepare.pl
Index: gforge-web-apache.postinst.dsfh-in
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/gforge-web-apache.postinst.dsfh-in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gforge-web-apache.postinst.dsfh-in 22 Nov 2003 17:41:56 -0000 1.8
+++ gforge-web-apache.postinst.dsfh-in 10 Jan 2004 22:14:05 -0000 1.9
@@ -49,8 +49,10 @@
# Patch Apache configuration files
/usr/lib/gforge/bin/install-apache.sh configure-files
- [ -e /etc/apache/httpd.conf ] && propose_update_install
/etc/apache/httpd.conf
- [ -e /etc/apache-ssl/httpd.conf ] && propose_update_install
/etc/apache-ssl/httpd.conf
+ for flavour in apache apache-perl apache-ssl ; do
+ [ -e /etc/$flavour/httpd.conf ] && propose_update_install
/etc/$flavour/httpd.conf
+ done
+
propose_update_install /etc/php4/apache/php.ini
propose_update_install /etc/php4/cgi/php.ini
Index: gforge-ldap-openldap.postinst.dsfh-in
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/gforge-ldap-openldap.postinst.dsfh-in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gforge-ldap-openldap.postinst.dsfh-in 17 Jun 2003 14:27:36 -0000
1.9
+++ gforge-ldap-openldap.postinst.dsfh-in 10 Jan 2004 22:14:05 -0000
1.10
@@ -73,7 +73,14 @@
db_fset gforge/shared/ldap_base_dn seen false
exit $err
;;
- 4)
+ 5)
+ echo "WARNING WARNING WARNING: LDAP Configuration Failed"
+ sf_ldap_base_dn=$(grep ^ldap_base_dn= /etc/gforge/gforge.conf |
cut -d= -f2-)
+ echo "It seems the LDAP load failed, possibly due to a password
mismatch"
+ echo "Please check your passwords (especially /etc/ldap.secret)
and try again."
+ exit $err
+ ;;
+ 99)
echo "WARNING WARNING WARNING: LDAP Configuration Failed"
sf_ldap_base_dn=$(grep ^ldap_base_dn= /etc/gforge/gforge.conf |
cut -d= -f2-)
echo "It seems the LDAP load failed for some unknown reason."
Index: gforge-db-postgresql.cron.d
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/gforge-db-postgresql.cron.d,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gforge-db-postgresql.cron.d 25 Jul 2003 12:37:36 -0000 1.5
+++ gforge-db-postgresql.cron.d 10 Jan 2004 22:14:05 -0000 1.6
@@ -47,3 +47,6 @@
# Daily sweep of the HTTP log files for project activity
15 0 * * * gforge [ -x /usr/lib/gforge/bin/stats_projects_logparse.pl ] &&
/usr/lib/gforge/bin/stats_projects_logparse.pl -d
include_path=/usr/share/gforge/:/usr/share/gforge/www/include > /dev/null 2>&1
+
+# Hourly sending of mass e-mailings
+48 * * * * gforge [ -x /usr/lib/gforge/bin/massmail.php ] &&
/usr/lib/gforge/bin/massmail.php -d
include_path=/usr/share/gforge/:/usr/share/gforge/www/include > /dev/null 2>&1
Index: control
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/control,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- control 29 Nov 2003 21:04:23 -0000 1.51
+++ control 10 Jan 2004 22:14:05 -0000 1.52
@@ -35,7 +35,7 @@
Package: gforge-web-apache
Architecture: all
-Depends: gforge-common, gforge-db-postgresql | gforge-db, apache (>= 1.3.29-2)
| apache-ssl (>= 1.3.29-2) | apache-perl (>= 1.3.29-2), libapache-mod-ssl |
apache-ssl, php4, php4-cgi, php4-pgsql, php4-gd, php4-ldap, perl, perl-suid,
libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32), slapd
(>= 2.0.23-3), cronolog
+Depends: gforge-common, gforge-db-postgresql | gforge-db, apache (>=
1.3.29.0.1-1) | apache-ssl (>= 1.3.29.0.1-1) | apache-perl (>= 1.3.29.0.1-1),
libapache-mod-ssl | apache-ssl, php4, php4-cgi, php4-pgsql, php4-gd, php4-ldap,
perl, perl-suid, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>=
1.0.32), slapd (>= 2.0.23-3), cronolog
Suggests: libphp-jpgraph
Replaces: sourceforge-web-apache (>> 2.6-0+11)
Provides: gforge-web
Index: changelog
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/changelog,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -d -r1.358 -r1.359
--- changelog 17 Dec 2003 20:03:03 -0000 1.358
+++ changelog 10 Jan 2004 22:14:05 -0000 1.359
@@ -1,4 +1,30 @@
-gforge (3.1-4+) unstable; urgency=low
+gforge (3.1-6+) unstable; urgency=low
+
+ * [Roland] Upgrade database schema using 20031105.sql and 20031124.sql.
+ * [Roland] Also use 20031129.sql, for the "last changed XX days ago"
+ patch from Hidenari Miwa and Tsutomu Tominaga.
+ * [Roland] Also use 20031126.sql, for the "cron manager" feature.
+
+ -- Roland Mas <address@hidden> Sat, 10 Jan 2004 23:08:13 +0100
+
+gforge (3.1-6) unstable; urgency=low
+
+ * [Roland] Detection of wrong passwords, with a message describing how
+ to fix (closes: #223693, #215577, #224257).
+ * [Roland] Insert data into LDAP using the robot DN, so as to minimise
+ the use of the admin DN.
+ * [Roland] Better detection of errors when creating database and user,
+ too.
+ * [Roland] Added cronjobs/massmail.php and enabled it in
+ gforge-db-postgresql.cron.d (closes: #225686).
+ * [Roland] Cleaned up the Apache installation process so that it works
+ more generically with apache{,-perl,-ssl} flavours. Also use
+ /etc/$flavour/conf.d/ directory (thus removing the hack that changed
+ the /etc/$flavour/httpd.conf file).
+
+ -- Roland Mas <address@hidden> Sat, 10 Jan 2004 22:41:21 +0100
+
+gforge (3.1-5) unstable; urgency=low
* [Christian] corrected stupid chmod error in user_dump_update.pl
that was making unwritable htdocs dir to the group
@@ -22,12 +48,10 @@
* [Roland] Added support for apache-perl too.
* [Roland] Fixed the way we use modules-config so that gforge-web-apache
does not hang on install (closes: #221172).
- * [Roland] Upgrade database schema using 20031105.sql and 20031124.sql.
- * [Roland] Also use 20031129.sql, for the "last changed XX days ago"
- patch from Hidenari Miwa and Tsutomu Tominaga.
- * [Roland] Also use 20031126.sql, for the "cron manager" feature.
+ * [Roland] Added "--encoding=UNICODE" to the restore action of
+ install-db.sh.
- -- Roland Mas <address@hidden> Wed, 3 Dec 2003 22:31:59 +0100
+ -- Roland Mas <address@hidden> Fri, 9 Jan 2004 22:35:34 +0100
gforge (3.1-4) unstable; urgency=low
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gforge-commits] gforge/debian rules, 1.68, 1.69 gforge-web-apache.postinst.dsfh-in, 1.8, 1.9 gforge-ldap-openldap.postinst.dsfh-in, 1.9, 1.10 gforge-db-postgresql.cron.d, 1.5, 1.6 control, 1.51, 1.52 changelog, 1.358, 1.359,
lo-lan-do <=
- Prev by Date:
[Gforge-commits] gforge/utils/ldap sql2ldif.pl,1.10,1.11
- Next by Date:
[Gforge-commits] gforge/debian/dsf-helper replace-files.prerm, 1.3, 1.4 replace-files.postinst, 1.3, 1.4
- Previous by thread:
[Gforge-commits] gforge/utils/ldap sql2ldif.pl,1.10,1.11
- Next by thread:
[Gforge-commits] gforge/debian/dsf-helper replace-files.prerm, 1.3, 1.4 replace-files.postinst, 1.3, 1.4
- Index(es):