Commit 793d2c10 authored by benoit manager's avatar benoit manager

Merge branch '1.2-fixes' into 'master'

1.2 fixes

See merge request debian/fusiondirectory!56
parents f4130579 8ed53fd7
# Contributor Covenant Code of Conduct
## Our Pledge
In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, gender identity and expression, level of experience,
nationality, personal appearance, race, religion, or sexual identity and
orientation.
## Our Standards
Examples of behavior that contributes to creating a positive environment
include:
* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members
Examples of unacceptable behavior by participants include:
* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting
## Our Responsibilities
Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.
Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.
## Scope
This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.
## Enforcement
Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at <coc@fusiondirectory.org>. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.
Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.
## Attribution
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at [https://www.contributor-covenant.org/version/1/4][version]
[homepage]: https://www.contributor-covenant.org
[version]: https://www.contributor-covenant.org/version/1/4/
## %"FusionDirectory 1.2.1" - 2018-05-23
### Added
#### fusiondirectory
- fusiondirectory#5661 adapt control for php7 on stretch
- fusiondirectory#5680 Add include/class_Combinations.inc
### Changed
#### fusiondirectory
- fusiondirectory#5664 Correct developers plugin packaging
- fusiondirectory#5671 replace all the old forge.fusiondirectory.org urls
- fusiondirectory#5673 Remove the conf.d section from the fusiondirectory.postinst and fusiondirectory.postrm
- fusiondirectory#5677 Adapt packages to the removal of the contrib/docs directory
### Removed
#### fusiondirectory
- fusiondirectory#5672 change the content of the readme.source
- fusiondirectory#5676 Remove doc from fusiondirectory-schema
- fusiondirectory#5678 Move lighttpd.conf to fusiondirectory-core
- fusiondirectory#5682 Remove wheezy support
- fusiondirectory#5684 remove patch for misspelling not longer in the manpages
......@@ -37,7 +37,7 @@ Further information
===================
To improve this piece of software, please report all kind of errors using the bug tracker
on https://forge.fusiondirectory.org
on https://gitlab.fusiondirectory.org
Documentation: http://documentation.fusiondirectory.org/
Mailinglist: http://lists.fusiondirectory.org/
......
This package is built from tarballs (see debian/watch for URL).
For those of you who are interested in upstream Vcs logs and tags, see
the below info.
On the FusionDirectory homepage, people interested in the project's
version control system (Git) are directed to the project's Github account
([1]). However, at the time of writing this, the repositories on Github
are slightly out-of-date because of synchronization problems.
If you feel that FusionDirectory on Github is not up-to-date, please
checkout code on the project's primary Git-Vcs site:
http://git.fusiondirectory.org/gitweb/
light+love
Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 2015/06/24
[1] https://github.com/fusiondirectory
fusiondirectory (1.2.1-1) stable; urgency=medium
[Benoit Mortier]
* New upstream Release
-- Benoit Mortier <benoit.mortier@opensides.be> Wed, 23 May 2018 17:39:07 +0200
fusiondirectory (1.2-1) stable; urgency=medium
[Benoit Mortier]
......
fusiondirectory (1.2.1-1) oldstable; urgency=medium
[Benoit Mortier]
* New upstream Release
-- Benoit Mortier <benoit.mortier@opensides.be> Wed, 23 May 2018 17:41:51 +0200
fusiondirectory (1.2-1) oldstable; urgency=medium
[Benoit Mortier]
......
......@@ -33,14 +33,15 @@ Depends:
openssl,
php-cas,
php-fpdf,
php5|php,
php5-cli | php-cli,
php5-curl | php-curl,
php5-gd | php-gd,
php5-imagick | php-imagick,
php5-imap | php-imap,
php5-ldap | php-ldap,
php5-recode | php-recode,
php,
php-cli,
php-curl,
php-gd,
php-imagick,
php-imap,
php-ldap,
php-recode,
php-mbstring,
schema2ldif (>= 1.3),
smarty-gettext (>= 1.1),
smarty3,
......
......@@ -20,6 +20,7 @@ Depends:
fusiondirectory-smarty3-acl-render (= ${binary:Version}),
gettext,
javascript-common,
libarchive-extract-perl,
libcrypt-cbc-perl,
libdigest-sha-perl,
libfile-copy-recursive-perl,
......
......@@ -747,7 +747,7 @@ Files:
plugins/alias/html/themes/breezy/svg/16/apps/alias.svg
plugins/alias/html/themes/breezy/svg/16/apps/alias-sympa.svg
plugins/alias/html/themes/breezy/svg/48/apps/alias.svg
plugins/applications/html/images/default_icon.png
plugins/applications/html/plugins/applications/images/default_icon.png
plugins/argonaut/html/themes/breezy/icons/16/actions/view-logs.png
plugins/argonaut/html/themes/breezy/icons/16/apps/argonaut-dns.png
plugins/argonaut/html/themes/breezy/icons/16/apps/argonaut-fuse.png
......@@ -1088,7 +1088,6 @@ Files:
core/contrib/images/favicon.svg
core/contrib/images/Fusiondirectory-logo-noir.eps
core/contrib/images/Fusiondirectory-logo.png
core/contrib/lighttpd/fusiondirectory-lighttpd.conf
core/contrib/man/fusiondirectory.conf.5
core/contrib/man/fusiondirectory.conf.pod
core/contrib/man/fusiondirectory-insert-schema.1
......@@ -1210,7 +1209,7 @@ Files:
plugins/alias/contrib/openldap/alias-fd.schema
plugins/applications/contrib/openldap/applications-fd-conf.schema
plugins/applications/contrib/openldap/applications-fd.schema
plugins/applications/html/images/default_icon.svg
plugins/applications/contrib/svg/default_icon.svg
plugins/argonaut/addons/argonaut/deploy-filter.xml
plugins/argonaut/addons/argonaut/deploy-list.tpl
plugins/argonaut/addons/argonaut/deploy-list.xml
......@@ -1229,7 +1228,6 @@ Files:
plugins/debconf/contrib/openldap/debconf.schema
plugins/developers/CODING
plugins/developers/debug-help/addons/debug-help/debughelp.tpl
plugins/developers/debug-help/html/images/icon.png
plugins/developers/Doxyfile
plugins/developers/FDStandard/GUIDELINES
plugins/developers/FDStandard/ruleset.xml
......@@ -1260,7 +1258,7 @@ Files:
plugins/fusioninventory/contrib/openldap/fusioninventory-fd.schema
plugins/fusioninventory/contrib/openldap/inventory-fd.schema
plugins/fusioninventory/html/collect.php
plugins/fusioninventory/html/plugins/inventory.css
plugins/fusioninventory/html/plugins/fusioninventory/inventory.css
plugins/.gitignore
plugins/gpg/contrib/openldap/gpg-fd.schema
plugins/gpg/personal/gpg/pgpKeySelect/pgpKeySelect-list.xml
......@@ -1283,10 +1281,9 @@ Files:
plugins/postfix/html/themes/breezy/icons/16/apps/smtp.png
plugins/postfix/html/themes/breezy/svg/16/smtp.svg
plugins/ppolicy/addons/dashboard/ppolicy_locked_accounts.tpl
plugins/ppolicy/contrib/images/ppolicy.svg
plugins/ppolicy/contrib/openldap/ppolicyconfig.ldif
plugins/ppolicy/contrib/openldap/ppolicy-fd-conf.schema
plugins/ppolicy/contrib/openldap/ppolicymodule.ldif
plugins/ppolicy/contrib/doc/ppolicyconfig.ldif
plugins/ppolicy/contrib/doc/ppolicymodule.ldif
plugins/ppolicy/html/themes/breezy/icons/16/apps/ppolicy.png
plugins/ppolicy/html/themes/breezy/icons/48/apps/ppolicy.png
plugins/ppolicy/html/themes/breezy/svg/16/apps/ppolicy.svg
......@@ -1325,23 +1322,23 @@ Files:
plugins/supann/contrib/openldap/internet2.schema
plugins/supann/contrib/openldap/supann_2009.schema
plugins/supann/contrib/openldap/supann-fd-conf.schema
plugins/supann/contrib/supann/activite_CNU
plugins/supann/contrib/supann/activite_REFERENS
plugins/supann/contrib/supann/affiliation
plugins/supann/contrib/supann/corps
plugins/supann/contrib/supann/diplome_EXAMPLE
plugins/supann/contrib/supann/diplome_SISE
plugins/supann/contrib/supann/discipline_EXAMPLE
plugins/supann/contrib/supann/discipline_SISE
plugins/supann/contrib/supann/entite
plugins/supann/contrib/supann/etablissement_SUPANN
plugins/supann/contrib/supann/etuelementpedagogique_EXAMPLE
plugins/supann/contrib/supann/etuetape_EXAMPLE
plugins/supann/contrib/supann/eturegimeinscription_EXAMPLE
plugins/supann/contrib/supann/eturegimeinscription_SISE
plugins/supann/contrib/supann/role_SUPANN
plugins/supann/contrib/supann/typediplome_EXAMPLE
plugins/supann/contrib/supann/typediplome_SISE
plugins/supann/contrib/etc/activite_CNU
plugins/supann/contrib/etc/activite_REFERENS
plugins/supann/contrib/etc/affiliation
plugins/supann/contrib/etc/corps
plugins/supann/contrib/etc/diplome_SISE
plugins/supann/contrib/etc/discipline_SISE
plugins/supann/contrib/etc/entite
plugins/supann/contrib/etc/etablissement_SUPANN
plugins/supann/contrib/etc/eturegimeinscription_SISE
plugins/supann/contrib/etc/role_SUPANN
plugins/supann/contrib/etc/typediplome_SISE
plugins/supann/contrib/doc/examples/diplome_EXAMPLE
plugins/supann/contrib/doc/examples/discipline_EXAMPLE
plugins/supann/contrib/doc/examples/etuelementpedagogique_EXAMPLE
plugins/supann/contrib/doc/examples/etuetape_EXAMPLE
plugins/supann/contrib/doc/examples/eturegimeinscription_EXAMPLE
plugins/supann/contrib/doc/examples/typediplome_EXAMPLE
plugins/supann/personal/supann/student_subscription.tpl
plugins/sympa/contrib/openldap/sympa-fd.schema
plugins/systems/addons/dashboard/network_dhcp.tpl
......@@ -1469,11 +1466,6 @@ Copyright:
2007, Mathieu Jondet <mathieu@eulerian.com>
License: Expat
Files:
plugins/ppolicy/contrib/images/ppolicy.svg
Copyright: *No copyright*
License: CC-BY-SA
Files:
debian/*
README.multi-orig-tarball-package
......
......@@ -1325,7 +1325,6 @@ Files: README.multi-orig-tarball-package
core/contrib/docs/UPGRADE
core/contrib/fusiondirectory.conf
core/contrib/images/favicon.svg
core/contrib/lighttpd/fusiondirectory-lighttpd.conf
core/contrib/man/fusiondirectory-insert-schema.1
core/contrib/man/fusiondirectory-setup.1
core/contrib/man/fusiondirectory.conf.5
......@@ -1571,7 +1570,6 @@ Files: README.multi-orig-tarball-package
debian/control
debian/copyright
debian/copyright.in
debian/fusiondirectory-lighttpd.conf
debian/fusiondirectory-plugin-alias-schema.dirs
debian/fusiondirectory-plugin-alias-schema.install
debian/fusiondirectory-plugin-alias.dirs
......@@ -1805,7 +1803,7 @@ Files: README.multi-orig-tarball-package
plugins/alias/html/themes/breezy/svg/48/apps/alias.svg
plugins/applications/contrib/openldap/applications-fd-conf.schema
plugins/applications/contrib/openldap/applications-fd.schema
plugins/applications/html/images/default_icon.svg
plugins/applications/contrib/svg/default_icon.svg
plugins/argonaut/addons/argonaut/deploy-filter.xml
plugins/argonaut/addons/argonaut/deploy-list.tpl
plugins/argonaut/addons/argonaut/deploy-list.xml
......@@ -1848,7 +1846,6 @@ Files: README.multi-orig-tarball-package
plugins/developers/FDStandard/Sniffs/WhiteSpace/FunctionCallArgumentSpacingSniff.php
plugins/developers/FDStandard/ruleset.xml
plugins/developers/debug-help/addons/debug-help/debughelp.tpl
plugins/developers/debug-help/html/images/icon.svg
plugins/developers/filter.xsd
plugins/developers/list.xsd
plugins/developers/simple-plugin/demoPlugin/demoplugin.ldif
......@@ -1897,7 +1894,7 @@ Files: README.multi-orig-tarball-package
plugins/fusioninventory/contrib/openldap/fusioninventory-fd.schema
plugins/fusioninventory/contrib/openldap/inventory-fd.schema
plugins/fusioninventory/html/collect.php
plugins/fusioninventory/html/plugins/inventory.css
plugins/fusioninventory/html/plugins/fusioninventory/inventory.css
plugins/fusioninventory/html/themes/breezy/svg/16/apps/fusioninventory.svg
plugins/fusioninventory/html/themes/breezy/svg/48/apps/fusioninventory.svg
plugins/gpg/contrib/openldap/gpg-fd.schema
......@@ -1941,10 +1938,9 @@ Files: README.multi-orig-tarball-package
plugins/postfix/contrib/openldap/postfix-fd.schema
plugins/postfix/html/themes/breezy/svg/16/smtp.svg
plugins/ppolicy/addons/dashboard/ppolicy_locked_accounts.tpl
plugins/ppolicy/contrib/images/ppolicy.svg
plugins/ppolicy/contrib/openldap/ppolicy-fd-conf.schema
plugins/ppolicy/contrib/openldap/ppolicyconfig.ldif
plugins/ppolicy/contrib/openldap/ppolicymodule.ldif
plugins/ppolicy/contrib/doc/ppolicyconfig.ldif
plugins/ppolicy/contrib/doc/ppolicymodule.ldif
plugins/ppolicy/html/themes/breezy/svg/16/apps/ppolicy.svg
plugins/ppolicy/html/themes/breezy/svg/48/apps/ppolicy.svg
plugins/puppet/contrib/openldap/puppet-fd.schema
......@@ -1995,15 +1991,15 @@ Files: README.multi-orig-tarball-package
plugins/sudo/html/themes/breezy/svg/48/apps/sudo.svg
plugins/supann/contrib/openldap/internet2.schema
plugins/supann/contrib/openldap/supann-fd-conf.schema
plugins/supann/contrib/supann/activite_REFERENS
plugins/supann/contrib/supann/diplome_EXAMPLE
plugins/supann/contrib/supann/diplome_SISE
plugins/supann/contrib/supann/discipline_EXAMPLE
plugins/supann/contrib/supann/etablissement_SUPANN
plugins/supann/contrib/supann/etuelementpedagogique_EXAMPLE
plugins/supann/contrib/supann/etuetape_EXAMPLE
plugins/supann/contrib/supann/eturegimeinscription_EXAMPLE
plugins/supann/contrib/supann/typediplome_EXAMPLE
plugins/supann/contrib/etc/activite_REFERENS
plugins/supann/contrib/etc/diplome_SISE
plugins/supann/contrib/etc/etablissement_SUPANN
plugins/supann/contrib/doc/examples/diplome_EXAMPLE
plugins/supann/contrib/doc/examples/discipline_EXAMPLE
plugins/supann/contrib/doc/examples/etuelementpedagogique_EXAMPLE
plugins/supann/contrib/doc/examples/etuetape_EXAMPLE
plugins/supann/contrib/doc/examples/eturegimeinscription_EXAMPLE
plugins/supann/contrib/doc/examples/typediplome_EXAMPLE
plugins/supann/html/themes/breezy/svg/16/apps/supann-entite.svg
plugins/supann/html/themes/breezy/svg/16/apps/supann-etablissement.svg
plugins/supann/html/themes/breezy/svg/16/apps/supann.svg
......@@ -2477,11 +2473,11 @@ License: GPL-2+
FIXME
Files: plugins/supann/contrib/supann/activite_CNU
plugins/supann/contrib/supann/corps
plugins/supann/contrib/supann/discipline_SISE
plugins/supann/contrib/supann/eturegimeinscription_SISE
plugins/supann/contrib/supann/role_SUPANN
plugins/supann/contrib/supann/typediplome_SISE
plugins/supann/contrib/etc/corps
plugins/supann/contrib/etc/discipline_SISE
plugins/supann/contrib/etc/eturegimeinscription_SISE
plugins/supann/contrib/etc/role_SUPANN
plugins/supann/contrib/etc/typediplome_SISE
Copyright: le 14.11.2014
License: UNKNOWN
FIXME
......@@ -2647,7 +2643,7 @@ Copyright: 1989, 1991 Free Software Foundation, Inc
License: UNKNOWN
FIXME
Files: plugins/supann/contrib/supann/entite
Files: plugins/supann/contrib/etc/entite
Copyright: Hygiène et SÃcuritÃ
Tech. Par. Min. Ens. Sup. Rech
Technique Paritaire
......
# lighttpd configuration for FusionDirectory
# Set alias to http://<host>/fusiondirectory/
alias.url += (
"/fusiondirectory/" => "/usr/share/fusiondirectory/html/"
)
# Enable FastCGI and set it to handle .php URLs
# php-cgi is run with the FusionDirectory-required options
server.modules += ( "mod_fastcgi" )
$HTTP["url"] =~ "^/fusiondirectory/" {
fastcgi.server = ( ".php" =>
((
"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"
))
)
}
plugins/applications/admin /usr/share/fusiondirectory/plugins
plugins/applications/config /usr/share/fusiondirectory/plugins
plugins/applications/html/images /usr/share/fusiondirectory/html/plugins/applications
plugins/applications/html /usr/share/fusiondirectory
plugins/applications/locale /usr/share/fusiondirectory/locale/plugins/applications
plugins/developers/CODING /usr/share/doc/fusiondirectory-plugin-developers/
plugins/developers/Doxyfile /usr/share/doc/fusiondirectory-plugin-developers/
plugins/developers/FDStandard /usr/share/doc/fusiondirectory-plugin-developers/
plugins/developers/debug-help/addons /usr/share/fusiondirectory/plugins
plugins/developers/debug-help/html/images /usr/share/fusiondirectory/html/plugins/debug-help
plugins/developers/filter.xsd /usr/share/doc/fusiondirectory-plugin-developers/
plugins/developers/list.xsd /usr/share/doc/fusiondirectory-plugin-developers/
plugins/developers/simple-plugin /usr/share/doc/fusiondirectory-plugin-developers/
plugins/fusioninventory/admin /usr/share/fusiondirectory/plugins
plugins/fusioninventory/config /usr/share/fusiondirectory/plugins
plugins/fusioninventory/html/collect.php /usr/share/fusiondirectory/html/
plugins/fusioninventory/html/plugins/inventory.css /usr/share/fusiondirectory/html/plugins/fusioninventory
plugins/fusioninventory/html/themes /usr/share/fusiondirectory/html
plugins/fusioninventory/html /usr/share/fusiondirectory
plugins/fusioninventory/locale /usr/share/fusiondirectory/locale/plugins/fusioninventory
plugins/ppolicy/contrib/openldap/ppolicy-fd-conf.schema /etc/ldap/schema/fusiondirectory
plugins/ppolicy/contrib/openldap/ppolicyconfig.ldif /usr/share/doc/fusiondirectory-plugin-ppolicy
plugins/ppolicy/contrib/openldap/ppolicymodule.ldif /usr/share/doc/fusiondirectory-plugin-ppolicy
plugins/ppolicy/contrib/openldap/ppolicy-fd-conf.schema /etc/ldap/schema/fusiondirectory
plugins/ppolicy/contrib/doc/ppolicyconfig.ldif /usr/share/doc/fusiondirectory-plugin-ppolicy
plugins/ppolicy/contrib/doc/ppolicymodule.ldif /usr/share/doc/fusiondirectory-plugin-ppolicy
plugins/supann/admin /usr/share/fusiondirectory/plugins
plugins/supann/config /usr/share/fusiondirectory/plugins
plugins/supann/contrib/supann/activite_CNU /etc/fusiondirectory/supann/
plugins/supann/contrib/supann/activite_REFERENS /etc/fusiondirectory/supann/
plugins/supann/contrib/supann/affiliation /etc/fusiondirectory/supann/
plugins/supann/contrib/supann/corps /etc/fusiondirectory/supann/
plugins/supann/contrib/supann/diplome_EXAMPLE /usr/share/doc/fusiondirectory-plugin-supann/example
plugins/supann/contrib/supann/diplome_SISE /etc/fusiondirectory/supann/
plugins/supann/contrib/supann/discipline_EXAMPLE /usr/share/doc/fusiondirectory-plugin-supann/example
plugins/supann/contrib/supann/discipline_SISE /etc/fusiondirectory/supann/
plugins/supann/contrib/supann/entite /etc/fusiondirectory/supann/
plugins/supann/contrib/supann/etablissement_SUPANN /etc/fusiondirectory/supann/
plugins/supann/contrib/supann/etuelementpedagogique_EXAMPLE /usr/share/doc/fusiondirectory-plugin-supann/example
plugins/supann/contrib/supann/etuetape_EXAMPLE /usr/share/doc/fusiondirectory-plugin-supann/example
plugins/supann/contrib/supann/eturegimeinscription_EXAMPLE /usr/share/doc/fusiondirectory-plugin-supann/example
plugins/supann/contrib/supann/eturegimeinscription_SISE /etc/fusiondirectory/supann/
plugins/supann/contrib/supann/role_SUPANN /etc/fusiondirectory/supann/
plugins/supann/contrib/supann/typediplome_EXAMPLE /usr/share/doc/fusiondirectory-plugin-supann/example
plugins/supann/contrib/supann/typediplome_SISE /etc/fusiondirectory/supann/
plugins/supann/contrib/etc/* /etc/fusiondirectory/supann/
plugins/supann/contrib/doc/examples /usr/share/doc/fusiondirectory-plugin-supann
plugins/supann/html/themes /usr/share/fusiondirectory/html
plugins/supann/locale /usr/share/fusiondirectory/locale/plugins/supann
plugins/supann/personal /usr/share/fusiondirectory/plugins
core/contrib/docs/README.cnconfig
debian/fusiondirectory-lighttpd.conf
......@@ -21,6 +21,7 @@ core/include/class_SnapshotDialogs.inc /usr/share/fusiondirectory/in
core/include/class_SnapshotHandler.inc /usr/share/fusiondirectory/include
core/include/class_acl.inc /usr/share/fusiondirectory/include
core/include/class_baseSelector.inc /usr/share/fusiondirectory/include
core/include/class_Combinations.inc /usr/share/fusiondirectory/include
core/include/class_config.inc /usr/share/fusiondirectory/include
core/include/class_departmentSortIterator.inc /usr/share/fusiondirectory/include
core/include/class_divSelectBox.inc /usr/share/fusiondirectory/include
......
......@@ -26,41 +26,6 @@ esac
#DEBHELPER#
if [ -d /etc/apache2/conf.d ]; then
# Copy FusionDirectory configuration to conf.d directories
if [ ! -L /etc/apache2/conf.d/fusiondirectory.conf ]; then
# Remove old instances of this file
if [ -f /etc/apache2/conf.d/fusiondirectory.conf ]; then
echo "Found old fusiondirectory apache configuration in /etc/apache2/conf.d - moving it to fusiondirectory.conf.orig..."
echo "Please check for changes in /etc/fusiondirectory/fusiondirectory-apache.conf if you modified this file!"
mv /etc/apache2/conf.d/fusiondirectory.conf /etc/apache2/conf.d/fusiondirectory.conf.orig
fi
echo "Making /fusiondirectory available in /etc/apache2/conf.d"
# Add FusionDirectory include file
ln -s /etc/fusiondirectory/fusiondirectory-apache.conf /etc/apache2/conf.d/fusiondirectory.conf
fi
# Add support for RequestHeader
if which apache2 1>/dev/null; then
if which a2enmod 1>/dev/null; then
a2enmod headers
fi
fi
# Finally restart servers
if which apache2 1>/dev/null; then
if which invoke-rc.d 1>/dev/null; then
invoke-rc.d apache2 reload
else
/etc/init.d/apache2 reload
fi
fi
fi
# conf-available
if [ -d /etc/apache2/conf-available ] ; then
......@@ -69,9 +34,9 @@ if [ -d /etc/apache2/conf-available ] ; then
# Remove old instances of this file
if [ -f /etc/apache2/conf-available/fusiondirectory.conf ]; then
echo "Found old fusiondirectory apache configuration in /etc/apache2/conf.d - moving it to fusiondirectory.conf.orig..."
echo "Found old fusiondirectory apache configuration in /etc/apache2/conf-available - moving it to fusiondirectory.conf.orig..."
echo "Please check for changes in /etc/fusiondirectory/fusiondirectory-apache.conf if you modified this file!"
mv /etc/apache2/conf.d/fusiondirectory.conf /etc/apache2/conf.d/fusiondirectory.conf.orig
mv /etc/apache2/conf-available/fusiondirectory.conf /etc/apache2/conf-available/fusiondirectory.conf.orig
fi
echo "Making /fusiondirectory available in /etc/apache2/conf-available"
......
......@@ -7,22 +7,6 @@ set -e
case "$1" in
remove|purge)
if [ -d /etc/apache2/conf.d ]; then
# Remove FusionDirectory include
if [ -L /etc/apache2/conf.d/fusiondirectory.conf ]; then
rm -f /etc/apache2/conf.d/fusiondirectory.conf
fi
# Restart servers
if which apache2 1>/dev/null; then
if which invoke-rc.d 1>/dev/null; then
invoke-rc.d apache2 restart
else
/etc/init.d/apache2 restart
fi
fi
fi
if [ -d /etc/apache2/conf-available ] ; then
if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
. /usr/share/apache2/apache2-maintscript-helper
......
Description: Various spelling fixes in man pages.
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
--- a/core/contrib/man/fusiondirectory-setup.1
+++ b/core/contrib/man/fusiondirectory-setup.1
@@ -148,7 +148,7 @@
.IX Subsection "Options"
.IP "\-\-update\-cache" 4
.IX Item "--update-cache"
-This option update the /var/cache/fusiondirectory/class.cache file. Wich contain \s-1PHP\s0 classes used in FusionDirectory, and their location.
+This option update the /var/cache/fusiondirectory/class.cache file. Which contain \s-1PHP\s0 classes used in FusionDirectory, and their location.
.IP "\-\-update\-locales" 4
.IX Item "--update-locales"
This option update internalization, by generating a new .mo locales file for each language, with every .po files it found.
@@ -209,7 +209,7 @@
This option will list the dn of \s-1LDAP\s0 entries using deprecated attributes or objectclasses and no longer used by FusionDirectory.
.IP "\-\-ldif\-deprecated" 4
.IX Item "--ldif-deprecated"
-This option will print an \s-1LDIF\s0 to allow you to remove deprecated attributes from you ldap server. Be carefull and check before applying.
+This option will print an \s-1LDIF\s0 to allow you to remove deprecated attributes from you ldap server. Be careful and check before applying.
.IP "\-\-show\-config" 4
.IX Item "--show-config"
This option will print a dump of the FusionDirectory configuration \s-1LDAP\s0 node.
--- a/core/contrib/man/fusiondirectory.conf.5
+++ b/core/contrib/man/fusiondirectory.conf.5
@@ -205,11 +205,11 @@
This path needs to be writeable by the user your webserver is running with.
.IP "\fBignoreAcl\fR \fIdn\fR" 4
.IX Item "ignoreAcl dn"
-The ignoreAcl value tells FusionDirectory to ignore complete \s-1ACL\s0 sets for the given \s-1DN.\s0 Add your \s-1DN\s0 here and you'll be able to restore accidently dropped ACLs.
+The ignoreAcl value tells FusionDirectory to ignore complete \s-1ACL\s0 sets for the given \s-1DN.\s0 Add your \s-1DN\s0 here and you'll be able to restore accidentally dropped ACLs.
.IP "\fBdisplayerrors\fR bool" 4
.IX Item "displayerrors bool"
The displayerrors statement tells FusionDirectory to show \s-1PHP\s0 errors in the upper part of the screen. This should be disabled in productive deployments, because there
-might be some important passwords arround.
+might be some important passwords around.
.SS "Location section options"
.IX Subsection "Location section options"
.IP "\fBname\fR \fIstring\fR" 4
Author: Benoit Mortier
Description: put the FusionDirectory Debian directory in the apache alias
--- a/core/contrib/apache/fusiondirectory-apache.conf 2012-05-21 23:02:13.000000000 +0200
+++ b/core/contrib/apache/fusiondirectory-apache.conf 2012-05-21 23:02:24.000000000 +0200
@@ -1,5 +1,5 @@
Description: Add support for PHP 5 in jessie
Removed old php configuration keyword no longer used
Changed Location for Directory
Author: Benoit Mortier <benoit.mortier@opensides.be>
Origin: upstream
Bug-<Vendor>: https://gitlab.fusiondirectory.org/fusiondirectory/fd/issues/5837
Last-Update: 2018-05-11
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/core/contrib/apache/fusiondirectory-apache.conf
+++ b/core/contrib/apache/fusiondirectory-apache.conf
@@ -1,18 +1,14 @@
# Include FusionDirectory to your web service
-Alias /fusiondirectory /var/www/fusiondirectory/html
+Alias /fusiondirectory /usr/share/fusiondirectory/html
<IfModule mod_php5.c>
<Location /fusiondirectory>
-<Location /fusiondirectory>
+<Directory /fusiondirectory>
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_value upload_tmp_dir /var/spool/fusiondirectory/
php_admin_value session.cookie_lifetime 0
# Remove the comment from the line below if you use fusiondirectory-setup --encrypt-passwords
# include /etc/fusiondirectory/fusiondirectory.secrets
-</Location>
+</Directory>
</IfModule>
Author: Benoit Mortier
Description: put the Debian directory for scriptaculous into the script tag
Description: Put the Debian directory for scriptaculous into the script tag
Author: Benoit Mortier <benoit.mortier@opensides.be>
Origin: upstream
Last-Update: 2018-05-11
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/core/ihtml/themes/breezy/headers.tpl 2013-11-16 18:44:27.000000000 +0100
+++ b/core/ihtml/themes/breezy/headers.tpl 2013-11-16 18:47:18.145142151 +0100
@@ -15,14 +15,14 @@
......
Author: Benoit Mortier
Description: put the FusionDirectory Debian directory in the fd_home variable
Description: Put the FusionDirectory Debian directory in the fd_home variable
Author: Benoit Mortier <benoit.mortier@opensides.be>
Origin: upstream
Last-Update: 2018-05-11
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/core/contrib/bin/fusiondirectory-setup
+++ b/core/contrib/bin/fusiondirectory-setup
@@ -31,7 +31,7 @@
@@ -61,7 +61,7 @@ use Data::Dumper;
# fd's directory and class.cache file's path declaration
my %vars = (
......