This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, 6.1 has been updated
via e8c395d392fc60ca3dc474c3ea51abacdf887f6e (commit)
via 93bec535ef2756ddaa2327e0c0767f03adf44528 (commit)
via 3857a83047b3abf2de2a1879c08f7c308dfc4fe3 (commit)
via 3251f19bf044b628c5d2222862b652d8086a6ee2 (commit)
via 00bd3f14d5b2a695e07a8c7a91c211f02e6434bb (commit)
via ea33d4a6c688fe0b80562563ec8be2c9d2b102de (commit)
from 2746b1b800c867f625a808bf7bfc9cf47e28997e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=e8c395d392fc60ca3dc474c3ea51abacdf887f6e
commit e8c395d392fc60ca3dc474c3ea51abacdf887f6e
Author: Franck Villaume <[email protected]>
Date: Sat Apr 10 11:18:03 2021 +0200
sync CHANGES
diff --git a/src/CHANGES b/src/CHANGES
index 9189b42..b7f2776 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,4 +1,5 @@
FusionForge 6.1.1:
+* Install System: add support for OpenSuSE Leap 15.x [#930] (Ralf Habacker)
* Search Engine: fix PHP notice in SearchManager.class.php [#908] (TrivialDev)
* Plugin Scmhook: fix scmhook commitEmail for scmhg broken [#903] (TrivialDev)
* Plugin Scmhook: fix scmhook commitTracker [#911] (Florian Bruneau)
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=93bec535ef2756ddaa2327e0c0767f03adf44528
commit 93bec535ef2756ddaa2327e0c0767f03adf44528
Author: Ralf Habacker <[email protected]>
Date: Mon Mar 22 12:23:18 2021 +0100
[#920] autoinstall/install-src.sh: add missing package xinetd
diff --git a/autoinstall/install-src.sh b/autoinstall/install-src.sh
index ca679c1..7192d9d 100755
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@ -76,7 +76,7 @@ elif [ -e /etc/os-release ]; then
mercurial \
python-psycopg2 \
mediawiki moinmoin-wiki \
- vsftpd
+ vsftpd xinetd
suse_backport_from_fedora_rpm
else
yum install -y make tar
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=3857a83047b3abf2de2a1879c08f7c308dfc4fe3
commit 3857a83047b3abf2de2a1879c08f7c308dfc4fe3
Author: Ralf Habacker <[email protected]>
Date: Thu Mar 4 15:55:20 2021 +0100
[#920] autoinstall/install-src.sh: Update php version to 7 for SUSE
distributions
diff --git a/autoinstall/build.sh b/autoinstall/build.sh
index 1e8df61..e078ddc 100755
--- a/autoinstall/build.sh
+++ b/autoinstall/build.sh
@@ -170,7 +170,7 @@ function build_rpm {
function build_suse_rpm {
suse_check_release
suse_install_repos
- suse_install_rpms make gettext-runtime gettext-tools tar bzip2
rpm-build createrepo php5
+ suse_install_rpms make gettext-runtime gettext-tools tar bzip2
rpm-build createrepo php7
# Build package
cd $(dirname $0)/../src/
diff --git a/autoinstall/install-src.sh b/autoinstall/install-src.sh
index f0b85e9..ca679c1 100755
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@ -64,15 +64,15 @@ if [ -e /etc/debian_version ]; then
elif [ -e /etc/os-release ]; then
suse_check_release
suse_install_repos
- suse_install_rpms make gettext-runtime php5 php5-gettext php5-posix
php5-pgsql \
- apache2 apache2-mod_php5 apache2-mod_wsgi apache2-mod_mpm_itk \
+ suse_install_rpms make gettext-runtime php7 php7-gettext php7-posix
php7-pgsql \
+ apache2 apache2-mod_php7 apache2-mod_wsgi apache2-mod_mpm_itk \
postgresql-server postgresql-contrib subversion \
- php5-pear php5-pear-htmlpurifier php5-curl \
+ php7-pear php-pear-HTMLPurifier php7-curl \
mailman postfix \
openssh \
cvs rcs perl-IPC-Run perl-URI \
subversion-server \
- git git-web php5-pcntl \
+ git git-web php7-pcntl \
mercurial \
python-psycopg2 \
mediawiki moinmoin-wiki \
diff --git a/src/post-install.d/web/web.sh b/src/post-install.d/web/web.sh
index 9fcd5c7..b7a832c 100755
--- a/src/post-install.d/web/web.sh
+++ b/src/post-install.d/web/web.sh
@@ -120,7 +120,7 @@ case "$1" in
a2enmod version 2>/dev/null || true # opensuse..
a2enmod macro
if [ -e /etc/os-release ]; then
- a2enmod php5
+ a2enmod php7
a2enmod mpm_itk
a2enmod mod_access_compat
else
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=3251f19bf044b628c5d2222862b652d8086a6ee2
commit 3251f19bf044b628c5d2222862b652d8086a6ee2
Author: Ralf Habacker <[email protected]>
Date: Thu Mar 4 15:53:18 2021 +0100
[#920] autoinstall.sh: Fix detecting of openSUSE 15.x releases
diff --git a/autoinstall/build.sh b/autoinstall/build.sh
index dbe9ff2..1e8df61 100755
--- a/autoinstall/build.sh
+++ b/autoinstall/build.sh
@@ -200,7 +200,7 @@ if [ -e /etc/debian_version ]; then
build_deb
elif [ -e /etc/redhat-release ]; then
build_rpm
-elif [ -e /etc/SuSE-release ]; then
+elif [ -e /etc/os-release ]; then
build_suse_rpm
else
echo "Automated package building is not supported for this distribution."
diff --git a/autoinstall/common-backports b/autoinstall/common-backports
index 4d13ffd..56e982d 100644
--- a/autoinstall/common-backports
+++ b/autoinstall/common-backports
@@ -234,7 +234,7 @@ function suse_backport_from_fedora_rpm {
}
function suse_check_release {
- supported=$(. /etc/os-release; echo $VERSION | grep "42\.[123]")
+ supported=$(. /etc/os-release; echo $VERSION | grep "15\.[0123]")
if test -z "$supported"; then
echo "unsupported openSUSE version"
exit 1
diff --git a/autoinstall/install-gui.sh b/autoinstall/install-gui.sh
index 0677851..32caa03 100755
--- a/autoinstall/install-gui.sh
+++ b/autoinstall/install-gui.sh
@@ -7,7 +7,7 @@ if [ -e /etc/debian_version ]; then
apt-get install -y xorg nodm xfce4 gnome-icon-theme
sed -i -e 's/^NODM_ENABLED=.*/NODM_ENABLED=true/' -e
's/^NODM_USER=.*/NODM_USER=root/' /etc/default/nodm
/etc/init.d/nodm restart
-elif [ -e /etc/SuSE-release ]; then
+elif [ -e /etc/os-release ]; then
suse_check_release
suse_install_rpms patterns-openSUSE-xfce_basis
else
diff --git a/autoinstall/install-src.sh b/autoinstall/install-src.sh
index f420e63..f0b85e9 100755
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@ -61,7 +61,7 @@ if [ -e /etc/debian_version ]; then
if ! dpkg-vendor --is Ubuntu; then
apt-get install locales-all #
https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1394929
fi
-elif [ -e /etc/SuSE-release ]; then
+elif [ -e /etc/os-release ]; then
suse_check_release
suse_install_repos
suse_install_rpms make gettext-runtime php5 php5-gettext php5-posix
php5-pgsql \
diff --git a/autoinstall/install.sh b/autoinstall/install.sh
index ef34c05..0ac25ec 100755
--- a/autoinstall/install.sh
+++ b/autoinstall/install.sh
@@ -54,7 +54,7 @@ if [ -e /etc/debian_version ]; then
apt-get install locales-all #
https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1394929
fi
fi
-elif [ -e /etc/SuSE-release ]; then
+elif [ -e /etc/os-release ]; then
suse_check_release
suse_install_repos
if rpm -q fusionforge >/dev/null ; then
diff --git a/autoinstall/uninstall.sh b/autoinstall/uninstall.sh
index 761d87b..b3a133b 100755
--- a/autoinstall/uninstall.sh
+++ b/autoinstall/uninstall.sh
@@ -3,7 +3,7 @@
if [ -e /etc/debian_version ]; then
aptitude purge ~nforge ~npostgres ~nnss-pgsql ~napache2 ~nphp ~npostfix
~nexim4
-elif [ -e /etc/SuSE-release ]; then
+elif [ -e /etc/os-release ]; then
zypper remove -y 'fusionforge*' postgresql-server
rm -f /etc/cron.d/fusionforge-*
else
diff --git a/autoinstall/update.sh b/autoinstall/update.sh
index ab2cf2c..6845159 100755
--- a/autoinstall/update.sh
+++ b/autoinstall/update.sh
@@ -4,7 +4,7 @@
if [ -e /etc/debian_version ]; then
aptitude update
aptitude -y dist-upgrade
-elif [ -e /etc/SuSE-release ]; then
+elif [ -e /etc/os-release ]; then
zypper update -y
else
yum upgrade
diff --git a/src/GNUmakefile.defaults b/src/GNUmakefile.defaults
index d4ccc1d..91979fe 100644
--- a/src/GNUmakefile.defaults
+++ b/src/GNUmakefile.defaults
@@ -43,7 +43,7 @@ INSTALL=install
CP_R=cp -r --preserve=timestamps
# Hard-coded detection of distro-specific Apache configuration
-apache_user=$(shell if [ -e /etc/redhat-release ]; then echo 'apache'; elif [
-e /etc/SuSE-release ]; then echo 'wwwrun'; else echo 'www-data'; fi)
-apache_group=$(shell if [ -e /etc/redhat-release ]; then echo 'apache'; elif [
-e /etc/SuSE-release ]; then echo 'www'; else echo 'www-data'; fi)
+apache_user=$(shell if [ -e /etc/redhat-release ]; then echo 'apache'; elif [
-e /etc/os-release ]; then echo 'wwwrun'; else echo 'www-data'; fi)
+apache_group=$(shell if [ -e /etc/redhat-release ]; then echo 'apache'; elif [
-e /etc/os-release ]; then echo 'www'; else echo 'www-data'; fi)
apache_service=$(shell if [ -e /etc/redhat-release ]; then echo 'httpd'; else
echo 'apache2'; fi)
-ssh_service=$(shell if [ -e /etc/redhat-release ]; then echo 'sshd'; elif [ -e
/etc/SuSE-release ]; then echo 'sshd'; else echo 'ssh'; fi)
+ssh_service=$(shell if [ -e /etc/redhat-release ]; then echo 'sshd'; elif [ -e
/etc/os-release ]; then echo 'sshd'; else echo 'ssh'; fi)
diff --git a/src/post-install.d/db/server.sh b/src/post-install.d/db/server.sh
index 87165a1..c189217 100755
--- a/src/post-install.d/db/server.sh
+++ b/src/post-install.d/db/server.sh
@@ -34,7 +34,7 @@ case "$1" in
fi
chkconfig postgresql on
fi
- if [ -e /etc/SuSE-release ]; then
+ if [ -e /etc/os-release ]; then
service postgresql start # creates initial db
chkconfig postgresql on
fi
diff --git a/src/post-install.d/web/web.sh b/src/post-install.d/web/web.sh
index 3021f4e..9fcd5c7 100755
--- a/src/post-install.d/web/web.sh
+++ b/src/post-install.d/web/web.sh
@@ -65,7 +65,7 @@ case "$1" in
a2ensite fusionforge.conf
elif [ -e /etc/redhat-release ]; then
ln -nfs $config_path/httpd.conf
/etc/httpd/conf.d/fusionforge.conf
- elif [ -e /etc/SuSE-release ]; then
+ elif [ -e /etc/os-release ]; then
ln -nfs $config_path/httpd.conf
/etc/apache2/conf.d/fusionforge.conf
else
echo "*** Note: please install $config_path/httpd.conf
in your Apache configuration"
@@ -119,7 +119,7 @@ case "$1" in
if [ -x /usr/sbin/a2enmod ]; then
a2enmod version 2>/dev/null || true # opensuse..
a2enmod macro
- if [ -e /etc/SuSE-release ]; then
+ if [ -e /etc/os-release ]; then
a2enmod php5
a2enmod mpm_itk
a2enmod mod_access_compat
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=00bd3f14d5b2a695e07a8c7a91c211f02e6434bb
commit 00bd3f14d5b2a695e07a8c7a91c211f02e6434bb
Author: Ralf Habacker <[email protected]>
Date: Mon Mar 22 11:18:53 2021 +0100
[#920] autoinstall: fix installing libnss-pgsql on openSUSE
diff --git a/autoinstall/common-backports b/autoinstall/common-backports
index b326351..4d13ffd 100644
--- a/autoinstall/common-backports
+++ b/autoinstall/common-backports
@@ -220,12 +220,16 @@ function suse_backport_from_fedora_rpm {
zypper in xmlto
zypper in rpm-build
zypper in postgresql-devel
- wget
https://download.fedoraproject.org/pub/fedora/linux/releases/25/Everything/source/tree/Packages/l/libnss-pgsql-1.5.0-0.14.beta.fc24.src.rpm
-O libnss-pgsql-1.5.0-0.14.beta.fc24.src.rpm
- rpm -ivh libnss-pgsql-1.5.0-0.14.beta.fc24.src.rpm
- sed -i -e 's|<libpq-fe.h|<pgsql/libpq-fe.h|'
/usr/src/packages/SOURCES/libnss-pgsql-fix_include.patch
- rpmbuild -ba /usr/src/packages/SPECS/libnss-pgsql.spec
- rpm -Uvh
/usr/src/packages/RPMS/x86_64/libnss-pgsql-1.5.0-0.14.beta.x86_64.rpm
- touch libnss-pgsql.done
+ zypper in wget patch
+ pkg=libnss-pgsql-1.5.0-0.24.beta.fc33.src.rpm
+ if ! test -f "$pkg"; then
+ wget
https://ftp-stud.hs-esslingen.de/pub/fedora/linux/releases/33/Everything/source/tree/Packages/l/$pkg
+ rpm -ivh $pkg
+ patch -d / -p0 -i
$PWD/autoinstall/libnss-pgsql-openSUSE-Leap-15.2.patch
+ rpmbuild -ba /usr/src/packages/SPECS/libnss-pgsql.spec
+ rpm -Uvh
/usr/src/packages/RPMS/x86_64/libnss-pgsql-1.5.0-0.24.beta.x86_64.rpm
+ touch libnss-pgsql.done
+ fi
fi
}
diff --git a/autoinstall/libnss-pgsql-openSUSE-Leap-15.2.patch
b/autoinstall/libnss-pgsql-openSUSE-Leap-15.2.patch
new file mode 100644
index 0000000..75e7bce
--- /dev/null
+++ b/autoinstall/libnss-pgsql-openSUSE-Leap-15.2.patch
@@ -0,0 +1,30 @@
+--- /usr/src/packages/SPECS/libnss-pgsql.spec 2021-03-22 10:58:15.126140222
+0100
++++ /usr/src/packages/SPECS/libnss-pgsql.spec 2021-03-22 10:58:45.866139600
+0100
+@@ -10,7 +10,7 @@
+ Patch1: libnss-pgsql-1.5.0-beta-exit-in-library.patch
+
+ BuildRequires: gcc
+-BuildRequires: libpq-devel, xmlto
++BuildRequires: postgresql-devel, xmlto
+
+
+ %description
+@@ -25,7 +25,7 @@
+
+
+ %build
+-%configure --disable-static
++CFLAGS="-I/usr/include/pgsql" %configure --disable-static
+ make %{?_smp_mflags}
+
+
+@@ -36,9 +36,6 @@
+ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+
+
+-%ldconfig_scriptlets
+-
+-
+ %files
+ %exclude %{_libdir}/*.so
+ %doc AUTHORS COPYING ChangeLog README doc/nss-pgsql.html doc/caution.png
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=ea33d4a6c688fe0b80562563ec8be2c9d2b102de
commit ea33d4a6c688fe0b80562563ec8be2c9d2b102de
Author: Ralf Habacker <[email protected]>
Date: Mon Apr 5 21:09:00 2021 +0200
[#930] Add a note on the git overview page for anonymous users that a
public key is required
diff --git a/src/plugins/scmgit/common/GitPlugin.class.php
b/src/plugins/scmgit/common/GitPlugin.class.php
index 79a70ac..f4ef46f 100644
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@ -209,6 +209,7 @@ control over it to the project's administrator.");
'Only project developers can
access the Git repositories via this method.',
count($repo_list)).
' '. _('SSH must be installed on your
client machine.').
+ ' '. _('Additionally, a public ssh key
must be available in the FusionForge settings of the respective user.').
' '. _('Substitute
<em>developername</em> with the proper value.'));
$htmlRepo = '';
foreach ($repo_list as $repo_name) {
-----------------------------------------------------------------------
Summary of changes:
autoinstall/build.sh | 4 +--
autoinstall/common-backports | 18 ++++++++------
autoinstall/install-gui.sh | 2 +-
autoinstall/install-src.sh | 12 ++++-----
autoinstall/install.sh | 2 +-
autoinstall/libnss-pgsql-openSUSE-Leap-15.2.patch | 30 +++++++++++++++++++++++
autoinstall/uninstall.sh | 2 +-
autoinstall/update.sh | 2 +-
src/CHANGES | 1 +
src/GNUmakefile.defaults | 6 ++---
src/plugins/scmgit/common/GitPlugin.class.php | 1 +
src/post-install.d/db/server.sh | 2 +-
src/post-install.d/web/web.sh | 6 ++---
13 files changed, 62 insertions(+), 26 deletions(-)
create mode 100644 autoinstall/libnss-pgsql-openSUSE-Leap-15.2.patch
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
