[debian-edu-commits] debian-edu/pkg-team/ 14/32: Imported Debian patch 2.7.4-1
Mike Gabriel
sunweaver at debian.org
Tue Apr 1 16:52:04 UTC 2014
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch master
in repository gosa.
commit 6e5adb53c7a25993fb661bf0aecc7235d056a5e3
Merge: a75c412 cf0e3fe
Author: Cajus Pollmeier <cajus at debian.org>
Date: Mon Apr 23 10:54:39 2012 +0200
Imported Debian patch 2.7.4-1
debian/changelog | 11 ++++
debian/control | 7 ++-
debian/gosa-lighttpd.conf | 2 +-
debian/gosa-plugin-dns-schema.install | 1 +
debian/gosa-plugin-fai-schema.install | 1 +
debian/gosa-plugin-mit-krb5-schema.install | 1 +
debian/gosa-plugin-nagios-schema.install | 1 +
debian/gosa-plugin-phpgw-schema.install | 1 +
debian/gosa-plugin-phpscheduleit-schema.install | 1 +
debian/gosa-plugin-pptp-schema.install | 1 +
debian/gosa-plugin-ssh-schema.install | 1 +
debian/gosa-plugin-sudo-schema.install | 1 +
debian/gosa.apache2 | 1 +
debian/{gosa-apache.conf => gosa.conf} | 2 +-
debian/gosa.install | 1 -
debian/gosa.postinst | 38 ++++--------
debian/gosa.postrm | 26 ++++----
debian/rules | 2 +-
gosa-core/Changelog | 14 +++++
gosa-core/include/class_core.inc | 10 ++++
gosa-core/include/functions.inc | 26 ++++----
.../class_password-methods-sasl.inc | 69 ++++++++++++++++++++++
gosa-core/include/utils/class_tests.inc | 23 +++++++-
.../plugins/admin/users/class_userManagement.inc | 27 ++++++++-
gosa-core/plugins/personal/generic/class_user.inc | 11 +++-
.../plugins/personal/password/class_password.inc | 6 +-
gosa-core/plugins/personal/password/password.tpl | 10 ++++
.../plugins/personal/posix/class_posixAccount.inc | 28 ++++++---
gosa-core/setup/class_setupStep_Checks.inc | 29 ++++-----
29 files changed, 259 insertions(+), 93 deletions(-)
diff --cc debian/changelog
index 979ab36,0000000..3f5ed14
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,123 -1,0 +1,134 @@@
++gosa (2.7.4-1) unstable; urgency=low
++
++ * New upstream release
++ * Apache2 transition to 2.4 (Closes: #669852)
++ * Corrected dependency of the netatalk plugin (Closes: #606980)
++ * Corrected dependency for deprecated Switch library (Closes: #629336)
++ * Made user id editable when applying templates (Closes: #629446)
++ * Added a conflict for no longer supported plugins (Closes: #608918, #608920)
++
++ -- Cajus Pollmeier <cajus at debian.org> Mon, 23 Apr 2012 10:54:39 +0200
++
+gosa (2.7.3-2) unstable; urgency=low
+
+ * Fixed purge in postrm script (Closes: #664852)
+ * Brazilian Portuguese debconf templates translation (Closes: #662178)
+
+ -- Cajus Pollmeier <cajus at debian.org> Thu, 22 Mar 2012 13:58:59 +0100
+
+gosa (2.7.3-1) unstable; urgency=low
+
+ * New upstream release
+ * Maintain DHCP information correctly (Closes: #650258)
+
+ -- Cajus Pollmeier <cajus at debian.org> Mon, 23 Jan 2012 09:07:40 +0100
+
+gosa (2.7.2-1) unstable; urgency=low
+
+ * New upstream release
+ * Added danish template translation (Closes: #628223)
+ * Removed extra spurious Czech translation file (Closes: #624209)
+ * Upstream has followed the whishlist bug (Closes: #629315)
+ * Fixed an incorrect warning issue (Closes: #629318)
+
+ -- Cajus Pollmeier <cajus at debian.org> Tue, 25 Oct 2011 13:48:03 +0200
+
+gosa (2.7.1-2) unstable; urgency=low
+
+ * Updated debconf translation (Closes: #624209)
+
+ -- Cajus Pollmeier <cajus at debian.org> Wed, 27 Apr 2011 08:32:00 +0200
+
+gosa (2.7.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Updated packaging to not include smarty (Closes: #620489)
+ * Fixed case of POSIX (Closes: #620486)
+
+ -- Cajus Pollmeier <cajus at debian.org> Mon, 04 Oct 2010 10:45:44 +0200
+
+gosa (2.6.11-1) unstable; urgency=low
+
+ * Samba schema file is incompatible with Samba shipped with lenny
+ (Closes: #582899)
+ * package explicitly depends on preform MPM (Closes: #591043)
+ * default config refers to missing FCGIWrapper (Closes: #591046)
+
+ -- Benoit Mortier <benoit.mortier at opensides.be> Fri, 13 Aug 2010 11:00:29 +0200
+
+gosa (2.6.10-2) unstable; urgency=low
+
+ * Removed faulty patch due to 3.0 source conversion
+ * Prevented /usr/share/doc/gosa.conf to be compressed
+ to make setup configuration file saving work again
+
+ -- Benoit Mortier <benoit.mortier at opensides.be> Tue, 27 Jul 2010 18:49:07 +0200
+
+gosa (2.6.10-1) unstable; urgency=low
+
+ [ Cajus Pollmeier ]
+ * New upstream release
+
+ [ Benoit Mortier ]
+ * Switch to dpkg-source 3.0 (quilt) format
+ * gosa fails with: "Fatal error: Call to undefined function
+ print_array() (Closes: #573220)
+ * GOSa fails to add IP and MAC addresses to samba created hosts
+ (Closes: #582896)
+
+ -- Benoit Mortier <benoit.mortier at opensides.be> Tue, 20 Jul 2010 12:48:02 +0200
+
+gosa (2.6.9-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Cajus Pollmeier <cajus at debian.org> Mon, 15 Mar 2010 11:28:48 +0100
+
+gosa (2.6.8-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Cajus Pollmeier <cajus at debian.org> Mon, 15 Feb 2010 14:19:14 +0100
+
+gosa (2.6.7-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Cajus Pollmeier <cajus at debian.org> Wed, 27 Jan 2010 21:53:12 +0100
+
+gosa (2.6.6-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Cajus Pollmeier <cajus at debian.org> Mon, 05 Oct 2009 15:03:41 +0200
+
+gosa (2.6.5-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Cajus Pollmeier <cajus at debian.org> Wed, 25 Feb 2009 13:36:18 +0100
+
+gosa (2.6.4-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Cajus Pollmeier <cajus at debian.org> Fri, 06 Feb 2009 11:35:38 +0100
+
+gosa (2.6.3-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Cajus Pollmeier <cajus at debian.org> Thu, 15 Jan 2009 11:43:15 +0100
+
+gosa (2.6.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Cajus Pollmeier <cajus at debian.org> Fri, 19 Dec 2008 09:51:32 +0100
+
+gosa (2.6.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Cajus Pollmeier <cajus at debian.org> Mon, 07 Apr 2008 11:18:53 +0200
+
diff --cc debian/control
index a57f84e,0000000..204a78e
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,536 -1,0 +1,537 @@@
+Source: gosa
+Section: web
+Priority: optional
+Maintainer: GOsa packages maintainers group <gosa-pkg at oss.gonicus.de>
+Uploaders: Cajus Pollmeier <cajus at debian.org>
- Build-Depends: debhelper (>= 7.0.50~)
++Build-Depends: debhelper (>= 7.0.50~), dh-apache2
+Build-Depends-Indep: po-debconf
+Standards-Version: 3.9.1
+Homepage: https://oss.gonicus.de/labs/gosa/
+Vcs-Browser: https://oss.gonicus.de/repositories/gosa/trunk
+Vcs-Svn: https://oss.gonicus.de/repositories/gosa/trunk
+DM-Upload-Allowed: yes
+
+Package: gosa
+Architecture: all
+Depends: php5, php5-cli, apache2 | lighttpd | httpd , exim4 | mail-transport-agent, php5-gd, php5-imap, php5-ldap, php5-mcrypt, php5-mysql, php5-imagick | imagemagick (>= 5.4.4.5-1) | graphicsmagick-im-compat, libcrypt-smbhash-perl, php5-recode, smarty3, gettext, ${misc:Depends}, libapache2-mod-php5 | php5-cgi, php5-curl, ttf-liberation
++Recommends: ${misc:Recommends}
+Suggests: gosa-si-server, cyrus21-imapd (>= 2.1.11), postfix-ldap, slapd, gosa-schema, php5-suhosin, php-apc, php-fpdf
+Conflicts: smarty3-gosa, smarty3-gettext, smarty-acl-render
+Description: Web Based LDAP Administration Program
+ Provided is access to posix, shadow, samba, proxy, fax, pureftp and
+ kerberos accounts. It is able to manage the postfix/cyrus server
+ combination and can write user adapted sieve scripts.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-dev
+Architecture: all
+Depends: ${misc:Depends}, gosa, php5-cli, latex2html, lyx
+Description: GOsa² development utilities
+ This package contains a couple of tools to generate online
+ help, extract localizations and howto's for developing Gosa² plugins.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-desktop
+Architecture: all
+Depends: ${misc:Depends}, konqueror | iceweasel | mozilla | firefox, debconf
+Description: Desktop integration for GOsa²
+ This package includes a Gosa² menu definition for your desktop
+ environment.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-schema
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: slapd
+Description: LDAP schema for GOsa
+ This package includes the basics LDAP schemas needed by GOsa².
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-help-en
+Architecture: all
+Depends: ${misc:Depends}, gosa
+Description: English online help for GOsa
+ This package includes the English online documentation for GOsa²
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-help-de
+Architecture: all
+Depends: ${misc:Depends}, gosa
+Description: German online help for GOsa²
+ This package includes the German online documentation for GOsa²
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-help-fr
+Architecture: all
+Depends: ${misc:Depends}, gosa
+Description: French online help for GOsa²
+ This package includes the French online documentation for GOsa²
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-help-nl
+Architecture: all
+Depends: ${misc:Depends}, gosa
+Description: Dutch online help for GOsa
+ This package includes the Dutch online documentation for GOsa²
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-connectivity
+Architecture: all
+Depends: ${misc:Depends}, gosa
+Breaks: gosa (<<2.7)
+Description: connectivity plugin for GOsa²
+ Connectivity base plugin - base for really small plugins.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-dhcp
+Architecture: all
+Depends: ${misc:Depends}, gosa, gosa-plugin-systems
+Breaks: gosa (<<2.7)
+Description: dhcp plugin for GOsa²
+ DHCP service management plugin.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-dhcp-schema
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: slapd
+Description: LDAP schema for GOsa² dhcp plugin
+ This package includes the LDAP schema needed by the GOsa²
+ dhcp plugin.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-dns
+Architecture: all
+Depends: ${misc:Depends}, gosa, gosa-plugin-systems
+Breaks: gosa (<<2.7)
+Description: dns plugin for GOsa²
+ DNS service management plugin.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-dns-schema
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: slapd
+Description: LDAP schema for GOsa² dns plugin
+ This package includes the LDAP schema needed by the GOsa²
+ dns plugin.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-fai
+Architecture: all
+Depends: ${misc:Depends}, gosa, gosa-plugin-goto
+Breaks: gosa (<<2.7)
+Description: fai plugin for GOsa²
+ FAI plugin for managing Linux system deployment.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-fai-schema
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: slapd
+Description: LDAP schema for GOsa² fai plugin
+ This package includes the LDAP schema needed by the GOsa²
+ fai plugin.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-gofax
+Architecture: all
+Depends: ${misc:Depends}, gosa, gosa-plugin-systems
+Breaks: gosa (<<2.7)
+Description: gofax plugin for GOsa²
+ GOfax management with report functionality
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-gofon
+Architecture: all
+Depends: ${misc:Depends}, gosa, gosa-plugin-systems
+Breaks: gosa (<<2.7)
+Description: gofon plugin for GOsa²
+ GOfon management with report functionality
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-goto
+Architecture: all
+Depends: ${misc:Depends}, gosa, gosa-plugin-systems
+Breaks: gosa (<<2.7)
+Description: goto plugin for GOsa²
+ GOto desktop management plugin
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-kolab
+Architecture: all
+Depends: ${misc:Depends}, gosa, gosa-plugin-connectivity, gosa-plugin-mail
+Breaks: gosa (<<2.7)
+Description: kolab plugin for GOsa²
+ Kolab2 account management plugin
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-kolab-schema
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: slapd
+Description: LDAP schema for GOsa² kolab plugin
+ This package includes the LDAP schema needed by the GOsa²
+ kolab plugin.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-ldapmanager
+Architecture: all
+Depends: ${misc:Depends}, gosa
+Breaks: gosa (<<2.7)
+Description: ldapmanager plugin for GOsa²
+ LDAP import and export management plugin
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-mail
+Architecture: all
+Depends: ${misc:Depends}, gosa, gosa-plugin-systems
+Breaks: gosa (<<2.7)
+Description: base mail plugin for GOsa²
+ Mail management base plugin
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-mit-krb5
+Architecture: all
+Conflicts: gosa-plugin-heimdal
+Breaks: gosa (<<2.7)
+Depends: ${misc:Depends}, gosa, gosa-plugin-systems
+Description: mit-krb5 plugin for GOsa²
+ MIT kerberos management plugin
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-mit-krb5-schema
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: slapd
+Description: LDAP schema for GOsa² mit-krb5 plugin
+ This package includes the LDAP schema needed by the GOsa²
+ mit-krb5 plugin.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-nagios
+Architecture: all
- Depends: ${misc:Depends}, gosa
++Depends: ${misc:Depends}, gosa, libswitch-perl | perl (<< 5.10.1-13)
+Breaks: gosa (<<2.7)
+Description: nagios plugin for GOsa²
+ Nagios account settings management
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-nagios-schema
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: slapd
+Description: LDAP schema for GOsa² nagios plugin
+ This package includes the LDAP schema needed by the GOsa²
+ nagios plugin.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-netatalk
+Architecture: all
- Depends: ${misc:Depends}, gosa, gosa-plugin-systems
++Depends: ${misc:Depends}, gosa, gosa-plugin-systems, gosa-plugin-goto
+Breaks: gosa (<<2.7)
+Description: netatalk plugin for GOsa²
+ Netatalk account management plugin
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-opengroupware
+Architecture: all
+Depends: ${misc:Depends}, gosa, gosa-plugin-mail, gosa-plugin-connectivity
+Breaks: gosa (<<2.7)
+Description: opengroupware plugin for GOsa²
+ Opengroupware account management plugin
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-openxchange
+Architecture: all
+Depends: ${misc:Depends}, gosa, gosa-plugin-mail, gosa-plugin-connectivity
+Breaks: gosa (<<2.7)
+Description: openxchange plugin for GOsa²
+ Open-Xchange account management plugin
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-openxchange-schema
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: slapd
+Description: LDAP schema for GOsa² openxchange plugin
+ This package includes the LDAP schema needed by the GOsa²
+ openxchange plugin.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-opsi
+Architecture: all
+Depends: ${misc:Depends}, gosa, gosa-plugin-fai, gosa-plugin-goto
+Breaks: gosa (<<2.7)
+Description: opsi plugin for GOsa²
+ opsi plugin for managing windows system and software deployment
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-phpgw
+Architecture: all
+Depends: ${misc:Depends}, gosa, gosa-plugin-mail, gosa-plugin-connectivity
+Breaks: gosa (<<2.7)
+Description: phpgw plugin for GOsa²
+ PHP Groupware connectivity plugin
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-phpgw-schema
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: slapd
+Description: LDAP schema for GOsa² phpgw plugin
+ This package includes the LDAP schema needed by the GOsa²
+ phpgw plugin.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-phpscheduleit
+Architecture: all
+Depends: ${misc:Depends}, gosa, gosa-plugin-connectivity
+Breaks: gosa (<<2.7)
+Description: phpscheduleit plugin for GOsa²
+ PHP scheduleit connectivity plugin
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-phpscheduleit-schema
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: slapd
+Description: LDAP schema for GOsa² phpscheduleit plugin
+ This package includes the LDAP schema needed by the GOsa²
+ phpscheduleit plugin.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-pptp
+Architecture: all
+Depends: ${misc:Depends}, gosa, gosa-plugin-connectivity
+Breaks: gosa (<<2.7)
+Description: pptp plugin for GOsa²
+ PPTP connectivity plugin
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-pptp-schema
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: slapd
+Description: LDAP schema for GOsa² pptp plugin
+ This package includes the LDAP schema needed by the GOsa²
+ pptp plugin.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-pureftpd
+Architecture: all
+Depends: ${misc:Depends}, gosa, gosa-plugin-connectivity
+Breaks: gosa (<<2.7)
+Description: pureftpd plugin for GOsa²
+ PureFTPD connectivity plugin.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-pureftpd-schema
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: slapd
+Description: LDAP schema for GOsa² pureftpd plugin
+ This package includes the LDAP schema needed by the GOsa²
+ pureftpd plugin.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-rolemanagement
+Architecture: all
+Depends: ${misc:Depends}, gosa
+Breaks: gosa (<<2.7)
+Description: rolemanagement plugin for GOsa²
+ Role Management plugin.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-rsyslog
+Architecture: all
+Depends: ${misc:Depends}, gosa, gosa-plugin-systems
+Breaks: gosa (<<2.7)
+Description: rsyslog plugin for GOsa²
+ Syslog and GOsa logging plugin.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-samba
+Architecture: all
+Depends: ${misc:Depends}, gosa
+Breaks: gosa (<<2.7)
+Description: samba3 plugin for GOsa²
+ Plugin for Samba 3 management.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-scalix
+Architecture: all
+Depends: ${misc:Depends}, gosa
+Breaks: gosa (<<2.7)
+Description: scalix plugin for GOsa²
+ Scalix account management plugin.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-squid
+Architecture: all
+Depends: ${misc:Depends}, gosa, gosa-plugin-connectivity
+Breaks: gosa (<<2.7)
+Description: squid plugin for GOsa²
+ Squid connectivity plugin.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-ssh
+Architecture: all
+Depends: ${misc:Depends}, gosa
+Breaks: gosa (<<2.7)
+Description: ssh plugin for GOsa²
+ SSH key management plugin.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-ssh-schema
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: slapd
+Description: LDAP schema for GOsa² ssh plugin
+ This package includes the LDAP schema needed by the GOsa²
+ ssh plugin.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-sudo
+Architecture: all
+Depends: ${misc:Depends}, gosa
+Breaks: gosa (<<2.7)
+Description: sudo plugin for GOsa²
+ Sudo management plugin.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-sudo-schema
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: slapd
+Description: LDAP schema for GOsa² sudo plugin
+ This package includes the LDAP schema needed by the GOsa
+ sudo plugin.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-systems
+Architecture: all
+Depends: ${misc:Depends}, gosa
+Breaks: gosa (<<2.7)
+Description: systems plugin for GOsa²
+ Systems management base plugin.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-uw-imap
+Architecture: all
+Depends: ${misc:Depends}, gosa, gosa-plugin-mail
+Breaks: gosa (<<2.7)
+Description: uw-imap plugin for GOsa²
+ UW imap mail method.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-plugin-webdav
+Architecture: all
+Depends: ${misc:Depends}, gosa, gosa-plugin-connectivity
+Breaks: gosa (<<2.7)
+Description: webdav plugin for GOsa²
+ WebDAV connectivity plugin.
+ .
+ GOsa² is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
diff --cc debian/gosa-lighttpd.conf
index 858c65b,0000000..8c4b318
mode 100644,000000..100644
--- a/debian/gosa-lighttpd.conf
+++ b/debian/gosa-lighttpd.conf
@@@ -1,29 -1,0 +1,29 @@@
+# lighttpd configuration for GOsa
+
+# Set alias to http://<host>/gosa/
+alias.url += (
+ "/gosa/" => "/usr/share/gosa/html/"
+)
+
+# Enable FastCGI and set it to handle .php URLs
+# php-cgi is run with the GOsa-required options
+server.modules += ( "mod_fastcgi" )
+
+$HTTP["url"] =~ "^/gosa/" {
+ fastcgi.server = ( ".php" =>
+ ((
- "bin-path" => "/usr/bin/php-cgi -d expose_php=Off -d magic_quotes_gpc=On",
++ "bin-path" => "/usr/bin/php-cgi -d expose_php=Off -d magic_quotes_gpc=Off",
+ "socket" => "/tmp/php.socket",
+ "max-procs" => 2,
+ "idle-timeout" => 20,
+ "bin-environment" => (
+ "PHP_FCGI_CHILDREN" => "4",
+ "PHP_FCGI_MAX_REQUESTS" => "10000"
+ ),
+ "bin-copy-environment" => (
+ "PATH", "SHELL", "USER"
+ ),
+ "broken-scriptfilename" => "enable"
+ ))
+ )
+}
diff --cc debian/gosa-plugin-dns-schema.install
index 5aceee3,0000000..fa3d401
mode 100644,000000..100644
--- a/debian/gosa-plugin-dns-schema.install
+++ b/debian/gosa-plugin-dns-schema.install
@@@ -1,1 -1,0 +1,2 @@@
++dns/contrib/dnszone.schema /etc/ldap/schema/gosa
+dns/contrib/dnszone.ldif /etc/ldap/schema/gosa
diff --cc debian/gosa-plugin-fai-schema.install
index f829582,0000000..4b46f9d
mode 100644,000000..100644
--- a/debian/gosa-plugin-fai-schema.install
+++ b/debian/gosa-plugin-fai-schema.install
@@@ -1,1 -1,0 +1,2 @@@
++fai/contrib/fai.schema /etc/ldap/schema/gosa
+fai/contrib/fai.ldif /etc/ldap/schema/gosa
diff --cc debian/gosa-plugin-mit-krb5-schema.install
index c2f25b8,0000000..7df5184
mode 100644,000000..100644
--- a/debian/gosa-plugin-mit-krb5-schema.install
+++ b/debian/gosa-plugin-mit-krb5-schema.install
@@@ -1,1 -1,0 +1,2 @@@
++mit-krb5/contrib/hdb.schema /etc/ldap/schema/gosa
+mit-krb5/contrib/hdb.ldif /etc/ldap/schema/gosa
diff --cc debian/gosa-plugin-nagios-schema.install
index fb09b88,0000000..8602bca
mode 100644,000000..100644
--- a/debian/gosa-plugin-nagios-schema.install
+++ b/debian/gosa-plugin-nagios-schema.install
@@@ -1,1 -1,0 +1,2 @@@
++nagios/contrib/nagios.schema /etc/ldap/schema/gosa
+nagios/contrib/nagios.ldif /etc/ldap/schema/gosa
diff --cc debian/gosa-plugin-phpgw-schema.install
index f0fb271,0000000..cb4c35f
mode 100644,000000..100644
--- a/debian/gosa-plugin-phpgw-schema.install
+++ b/debian/gosa-plugin-phpgw-schema.install
@@@ -1,1 -1,0 +1,2 @@@
+phpgw/contrib/phpgwaccount.ldif /etc/ldap/schema/gosa
++phpgw/contrib/phpgwaccount.schema /etc/ldap/schema/gosa
diff --cc debian/gosa-plugin-phpscheduleit-schema.install
index 9627609,0000000..d07ccb8
mode 100644,000000..100644
--- a/debian/gosa-plugin-phpscheduleit-schema.install
+++ b/debian/gosa-plugin-phpscheduleit-schema.install
@@@ -1,1 -1,0 +1,2 @@@
+phpscheduleit/contrib/phpscheduleit.ldif /etc/ldap/schema/gosa
++phpscheduleit/contrib/phpscheduleit.schema /etc/ldap/schema/gosa
diff --cc debian/gosa-plugin-pptp-schema.install
index f1ae43b,0000000..8169efb
mode 100644,000000..100644
--- a/debian/gosa-plugin-pptp-schema.install
+++ b/debian/gosa-plugin-pptp-schema.install
@@@ -1,1 -1,0 +1,2 @@@
+pptp/contrib/pptp.ldif /etc/ldap/schema/gosa
++pptp/contrib/pptp.schema /etc/ldap/schema/gosa
diff --cc debian/gosa-plugin-ssh-schema.install
index f817e7f,0000000..7df7eef
mode 100644,000000..100644
--- a/debian/gosa-plugin-ssh-schema.install
+++ b/debian/gosa-plugin-ssh-schema.install
@@@ -1,1 -1,0 +1,2 @@@
+ssh/contrib/openssh-lpk.ldif /etc/ldap/schema/gosa
++ssh/contrib/openssh-lpk.schema /etc/ldap/schema/gosa
diff --cc debian/gosa-plugin-sudo-schema.install
index c3c83d6,0000000..c67cf12
mode 100644,000000..100644
--- a/debian/gosa-plugin-sudo-schema.install
+++ b/debian/gosa-plugin-sudo-schema.install
@@@ -1,1 -1,0 +1,2 @@@
+sudo/contrib/sudo.ldif /etc/ldap/schema/gosa
++sudo/contrib/sudo.schema /etc/ldap/schema/gosa
diff --cc debian/gosa.apache2
index 0000000,0000000..6cb1c9f
new file mode 100644
--- /dev/null
+++ b/debian/gosa.apache2
@@@ -1,0 -1,0 +1,1 @@@
++conf debian/gosa.conf lighttpd
diff --cc debian/gosa.conf
index cd38aeb,0000000..5676ee2
mode 100644,000000..100644
--- a/debian/gosa.conf
+++ b/debian/gosa.conf
@@@ -1,28 -1,0 +1,28 @@@
+# Include GOsa to your web service
+Alias /gosa /usr/share/gosa/html
+
+<IfModule mod_php5.c>
+<Location /gosa>
+ php_admin_flag engine on
+ php_admin_flag register_globals off
+ php_admin_flag allow_call_time_pass_reference off
+ php_admin_flag expose_php off
+ php_admin_flag zend.ze1_compatibility_mode off
+ php_admin_flag register_long_arrays off
- php_admin_flag magic_quotes_gpc on
++ php_admin_flag magic_quotes_gpc off
+ php_admin_value upload_tmp_dir /var/spool/gosa/
+ php_admin_value session.cookie_lifetime 0
+ include /etc/gosa/gosa.secrets
+</Location>
+</IfModule>
+
+<IfModule mod_fcgid.c>
+ PHP_Fix_Pathinfo_Enable 1
+ <Location /gosa>
+ Options +ExecCGI
+ AddHandler fcgid-script .php
+ FCGIWrapper /var/www/php-fcgi/php-fcgi-starter .php
+ include /etc/gosa/gosa.secrets
+ </Location>
+</IfModule>
+
diff --cc debian/gosa.install
index 8a3d752,0000000..ea1e2e9
mode 100644,000000..100644
--- a/debian/gosa.install
+++ b/debian/gosa.install
@@@ -1,14 -1,0 +1,13 @@@
+gosa-core/update-gosa /usr/sbin
+gosa-core/bin/gosa-encrypt-passwords /usr/sbin
+gosa-core/html /usr/share/gosa
+gosa-core/ihtml /usr/share/gosa
+gosa-core/include /usr/share/gosa
+gosa-core/locale /usr/share/gosa
+gosa-core/plugins /usr/share/gosa
+gosa-core/setup /usr/share/gosa
- debian/gosa-apache.conf /etc/gosa
+debian/gosa-lighttpd.conf /etc/gosa
+gosa-core/contrib/shells /etc/gosa
+gosa-core/contrib/encodings /etc/gosa
+gosa-core/contrib/openldap/slapd.conf /usr/share/doc/gosa/slapd.conf-example
+gosa-core/contrib/gosa.conf /usr/share/doc/gosa
diff --cc debian/gosa.postinst
index c48ea12,0000000..a801999
mode 100644,000000..100644
--- a/debian/gosa.postinst
+++ b/debian/gosa.postinst
@@@ -1,111 -1,0 +1,97 @@@
+#!/bin/sh
+# postinst script for gosa
+#
+# see: dh_installdeb(1)
+
+set -e
+
+case "$1" in
+ configure)
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ triggered)
+ update-gosa
+ exit 0
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+# Set ID's
+WEBUSER="www-data"
+WEBGROUP="www-data"
++CONF="gosa"
+
+# Create empty inclusion file for apache
+if [ ! -f /etc/gosa/gosa.secrets ]; then
+ touch /etc/gosa/gosa.secrets
+ chmod 600 /etc/gosa/gosa.secrets
+fi
+
- if [ -d /etc/apache2/conf.d ]; then
-
- # Copy GOsa configuration to conf.d directories
- if [ ! -L /etc/apache2/conf.d/gosa.conf ]; then
-
- # Remove old instances of this file
- if [ -f /etc/apache2/conf.d/gosa.conf ]; then
- echo "Found old gosa apache configuration in /etc/apache2/conf.d - moving it to gosa.conf.orig..."
- echo "Please check for changes in /etc/gosa/gosa-apache.conf if you modified this file!"
- mv /etc/apache2/conf.d/gosa.conf /etc/apache2/conf.d/gosa.conf.orig
- fi
-
- echo "Making /gosa available in /etc/apache2/conf.d"
-
- # Add GOsa include file
- ln -s /etc/gosa/gosa-apache.conf /etc/apache2/conf.d/gosa.conf
- fi
++if [ -d /etc/apache2 ]; then
++ if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
++ . /usr/share/apache2/apache2-maintscript-helper
++ apache2_invoke enconf $CONF
++ elif dpkg-query -f '${Version}' -W 'apache2.2-common' > /dev/null 2>&1 ; then
++ [ -d /etc/apache2/conf.d/ ] && [ ! -L /etc/apache2/conf.d/$CONF.conf ] && ln -s ../conf-available/$CONF.conf /etc/apache2/conf.d/$CONF.conf
++ fi
+
- # Add support for RequestHeader
- a2enmod headers
-
- # Finally restart servers
- if [ -x /usr/sbin/invoke-rc.d ]; then
- invoke-rc.d apache2 reload
- else
- /etc/init.d/apache2 reload
- fi
++ # Add support for RequestHeader
++ if ! apache2_invoke enmod headers ; then
++ echo "Failed to enable the apache2 headers module!"
++ fi
+fi
+
+if [ -d /etc/lighttpd/conf-available ]; then
+
+ # Copy GOsa configuration to conf-available directories /etc/lighttpd/conf-available
+ if [ ! -L /etc/lighttpd/conf-enabled/99gosa-lighttpd.conf ]; then
+
+ # Remove old instances of this file
+ if [ -f /etc/lighttpd/conf-enabled/99gosa-lighttpd.conf ]; then
+ echo "Found old gosa apache configuration in /etc/lighttpd/conf-enabled - moving it to orig.gosa-lighttpd.conf ..."
+ echo "Please check for changes in /etc/lighttpd/conf-available/orig.99gosa-lighttpd.conf if you modified this file!"
+ mv /etc/lighttpd/conf-enabled/99gosa-lighttpd.conf /etc/lighttpd/conf-available/orig.gosa-lighttpd.conf
+ fi
+
+ echo "Making /gosa available in /etc/lighttpd/conf-enabled/"
+
+ # Add GOsa include file
+ ln -s /etc/gosa/gosa-lighttpd.conf /etc/lighttpd/conf-enabled/99gosa-lighttpd.conf
+ fi
+
+ # Finally restart servers
+ if [ -x /usr/sbin/invoke-rc.d ]; then
+ invoke-rc.d lighttpd reload
+ else
+ /etc/init.d/lighttpd reload
+ fi
+
+fi
+
+# Add links for safe mode
+[ ! -d /usr/share/gosa/bin ] && mkdir -p /usr/share/gosa/bin
+for source in /usr/bin/convert /usr/bin/lpstat; do
+ if [ -e $source ]; then
+ target=/usr/share/gosa/bin/${source##*/}
+ [ ! -L $target ] && ln -sf $source $target
+ fi
+done
+
+# Fix permission in /var/(spool|cache)/gosa
+chown root.$WEBGROUP -R /var/spool/gosa
+chmod 770 -R /var/spool/gosa
+chown root.$WEBGROUP -R /var/cache/gosa
+chmod 770 -R /var/cache/gosa
+
+update-gosa
+
+exit 0
diff --cc debian/gosa.postrm
index 253fcf3,0000000..4257db2
mode 100644,000000..100644
--- a/debian/gosa.postrm
+++ b/debian/gosa.postrm
@@@ -1,63 -1,0 +1,63 @@@
+#! /bin/sh
+# postrm script for GOsa
+#
+
+set -e
- set -x
++
++if [ "$1" = "remove" ] || [ "$1" = "purge" ] ; then
++
++ CONF="gosa"
++
++ if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
++ . /usr/share/apache2/apache2-maintscript-helper
++ apache2_invoke disconf $CONF
++ elif dpkg-query -f '${Version}' -W 'apache2.2-common' > /dev/null 2>&1 ; then
++ [ -L /etc/apache2/conf.d/$CONF.conf ] && rm /etc/apache2/conf.d/$CONF.conf
++ fi
++
++fi
+
+case "$1" in
+ purge)
+ if [ -d /var/spool/gosa ] ; then
+ echo "Removing /var/spool/gosa as requested."
+ rm -Rf /var/spool/gosa
+ fi
+ if [ -d /var/cache/gosa ] ; then
+ echo "Removing /var/cache/gosa as requested."
+ rm -Rf /var/cache/gosa
+ fi
+
+ [ -e /etc/gosa/gosa.secrets ] && rm /etc/gosa/gosa.secrets
+ [ -e /usr/share/gosa/html/themes/default/images/img.png ] && rm /usr/share/gosa/html/themes/default/images/img.png
+ [ -e /usr/share/gosa/ihtml/themes/default/img.styles ] && rm /usr/share/gosa/ihtml/themes/default/img.styles
+ find /usr/share/gosa -depth -type d -empty -exec rmdir "{}" \;
+ ;;
+
+ remove)
- if [ -d /etc/apache2/conf.d ]; then
- # Remove GOsa include
- [ -L /etc/apache2/conf.d/gosa.conf ] && rm -f /etc/apache2/conf.d/gosa.conf
-
- # Restart servers
- if [ -x /usr/sbin/invoke-rc.d ]; then
- invoke-rc.d apache2 restart
- else
- /etc/init.d/apache2 restart
- fi
- fi
-
+ if [ -d /etc/lighttpd/conf-available ]; then
+ # Remove GOsa include
+ [ -L /etc/lighttpd/conf-enabled/99gosa-lighttpd.conf ] && rm -f /etc/lighttpd/conf-enabled/99gosa-lighttpd.conf
+
+ # Restart servers
+ if [ -x /usr/sbin/invoke-rc.d ]; then
+ invoke-rc.d lighttpd restart
+ else
+ /etc/init.d/lighttpd restart
+ fi
+ fi
+
+ ;;
+
+ upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 0
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --cc debian/rules
index 4e8a1c3,0000000..05c0e44
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,24 -1,0 +1,24 @@@
+#!/usr/bin/make -f
+
+%:
- dh $@
++ dh $@ --with apache2
+
+override_dh_compress:
+ dh_compress
+ gzip -d debian/gosa/usr/share/doc/gosa/gosa.conf.gz
+
+override_dh_install:
+ dh_install --exclude=*ttf
+ mkdir -p debian/gosa/usr/share/gosa/html/themes/default/fonts
+ ln -sf /usr/share/fonts/truetype/ttf-liberation/LiberationSerif-Italic.ttf debian/gosa/usr/share/gosa/html/themes/default/fonts
+ ln -sf /usr/share/fonts/truetype/ttf-liberation/LiberationMono-Regular.ttf debian/gosa/usr/share/gosa/html/themes/default/fonts
+ ln -sf /usr/share/fonts/truetype/ttf-liberation/LiberationSerif-Regular.ttf debian/gosa/usr/share/gosa/html/themes/default/fonts
+ ln -sf /usr/share/fonts/truetype/ttf-liberation/LiberationSans-Regular.ttf debian/gosa/usr/share/gosa/html/themes/default/fonts
+ ln -sf /usr/share/fonts/truetype/ttf-liberation/LiberationSans-Italic.ttf debian/gosa/usr/share/gosa/html/themes/default/fonts
+ ln -sf /usr/share/fonts/truetype/ttf-liberation/LiberationMono-Italic.ttf debian/gosa/usr/share/gosa/html/themes/default/fonts
+ ln -sf /usr/share/fonts/truetype/ttf-liberation/LiberationSerif-BoldItalic.ttf debian/gosa/usr/share/gosa/html/themes/default/fonts
+ ln -sf /usr/share/fonts/truetype/ttf-liberation/LiberationMono-Bold.ttf debian/gosa/usr/share/gosa/html/themes/default/fonts
+ ln -sf /usr/share/fonts/truetype/ttf-liberation/LiberationSans-Bold.ttf debian/gosa/usr/share/gosa/html/themes/default/fonts
+ ln -sf /usr/share/fonts/truetype/ttf-liberation/LiberationSans-BoldItalic.ttf debian/gosa/usr/share/gosa/html/themes/default/fonts
+ ln -sf /usr/share/fonts/truetype/ttf-liberation/LiberationMono-BoldItalic.ttf debian/gosa/usr/share/gosa/html/themes/default/fonts
+ ln -sf /usr/share/fonts/truetype/ttf-liberation/LiberationSerif-Bold.ttf debian/gosa/usr/share/gosa/html/themes/default/fonts
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/gosa.git
More information about the debian-edu-commits
mailing list