Some Debian changes coming from Debian official

This commit is contained in:
Xavier Guimard 2018-11-13 22:02:53 +01:00
parent 8c46855886
commit dc01f8666b
8 changed files with 15 additions and 18 deletions

4
debian/control vendored
View File

@ -7,6 +7,7 @@ Build-Depends: debhelper (>= 10),
po-debconf
Build-Depends-Indep: libapache-session-perl,
libauthen-oath-perl,
libauthen-u2f-perl,
libcache-cache-perl,
libclone-perl,
libconfig-inifiles-perl,
@ -15,6 +16,7 @@ Build-Depends-Indep: libapache-session-perl,
libcrypt-openssl-rsa-perl,
libcrypt-openssl-x509-perl,
libcrypt-rijndael-perl,
libcrypt-u2f-server-perl,
libdbd-sqlite3-perl,
libdbi-perl,
libdigest-hmac-perl,
@ -277,7 +279,7 @@ Suggests: libauthcas-perl,
libglib-perl,
libimage-magick-perl,
liblasso-perl,
libnet-facebook-oauth2-perl (>= 0.10-1),
libnet-facebook-oauth2-perl (>= 0.10),
libnet-openid-consumer-perl,
libnet-openid-server-perl,
libnet-oauth-perl,

View File

@ -2,10 +2,10 @@
#NPROC = 7
# Unix socket to listen to
SOCKET=/var/run/llng-fastcgi-server/llng-fastcgi.sock
SOCKET=/run/llng-fastcgi-server/llng-fastcgi.sock
# Pid file
PID=/var/run/llng-fastcgi-server/llng-fastcgi-server.pid
PID=/run/llng-fastcgi-server/llng-fastcgi-server.pid
# User and GROUP
USER=www-data

View File

@ -29,10 +29,10 @@ test -x $DAEMON || exit 0
# Try to extract llng-fastcgi-server pidfile
if [ -z "$PID" ]; then
PID=/var/run/llng-fastcgi-server/llng-fastcgi-server.pid
PID=/run/llng-fastcgi-server/llng-fastcgi-server.pid
fi
if [ -z "$SOCKET" ]; then
SOCKET=/var/run/llng-fastcgi-server/llng-fastcgi.sock
SOCKET=/run/llng-fastcgi-server/llng-fastcgi.sock
fi
for f in "$PID" "$SOCKET"; do

View File

@ -6,7 +6,7 @@ Documentation=https://lemonldap-ng.org/documentation/latest/fastcgiserver
[Service]
Type=forking
EnvironmentFile=/etc/default/lemonldap-ng-fastcgi-server
PIDFile=/var/run/llng-fastcgi-server/llng-fastcgi-server.pid
PIDFile=/run/llng-fastcgi-server/llng-fastcgi-server.pid
ExecStart=/usr/sbin/llng-fastcgi-server
ExecStop=-/sbin/start-stop-daemon --quiet --stop --retry QUIT/5 --pidfile ${PID}
KillMode=mixed

View File

@ -1,17 +1,8 @@
# These serialized files just contains 2 constants
lemonldap-ng source: insane-line-length-in-source-file doc/pages/documentation/current/lib/exe/js.php.t.bootstrap3.js line length is 1787 characters (>512)
lemonldap-ng source: source-contains-prebuilt-javascript-object doc/pages/documentation/current/lib/exe/js.php.t.bootstrap3.js line length is 1787 characters (>512)
lemonldap-ng source: source-is-missing doc/pages/documentation/current/lib/exe/js.php.t.bootstrap3.js line length is 1787 characters (>512)
lemonldap-ng source: source-is-missing doc/pages/documentation/current/lib/tpl/bootstrap3/assets/bootstrap/js/bootstrap.min.js
lemonldap-ng source: insane-line-length-in-source-file po-doc/fr/pages/documentation/current/lib/exe/js.php.t.bootstrap3.js line length is 1787 characters (>512)
lemonldap-ng source: source-contains-prebuilt-javascript-object po-doc/fr/pages/documentation/current/lib/exe/js.php.t.bootstrap3.js line length is 1787 characters (>512)
lemonldap-ng source: source-is-missing po-doc/fr/pages/documentation/current/lib/exe/js.php.t.bootstrap3.js line length is 1787 characters (>512)
lemonldap-ng source: insane-line-length-in-source-file doc/pages/documentation/current/lib/exe/js.php.t.bootstrap3.js line length is 1787 characters (>512)
# False positive: these long lines are in source files (and deleted during build) with USEDEBIANLIBS=yes
lemonldap-ng source: insane-line-length-in-source-file lemonldap-ng-manager/site/htdocs/static/bwr/angular-bootstrap/ui-bootstrap-tpls.js line length is 683 characters (>512)
lemonldap-ng source: source-contains-prebuilt-javascript-object lemonldap-ng-manager/site/htdocs/static/bwr/angular-bootstrap/ui-bootstrap-tpls.js line length is 680 characters (>512)
lemonldap-ng source: source-is-missing lemonldap-ng-manager/site/htdocs/static/bwr/angular-bootstrap/ui-bootstrap-tpls.js line length is 680 characters (>512)
lemonldap-ng source: insane-line-length-in-source-file lemonldap-ng-manager/site/htdocs/static/bwr/es5-shim/es5-shim.js line length is 1119 characters (>512)
lemonldap-ng source: source-contains-prebuilt-javascript-object lemonldap-ng-manager/site/htdocs/static/bwr/es5-shim/es5-shim.js line length is 290 characters (>256)
lemonldap-ng source: source-is-missing lemonldap-ng-manager/site/htdocs/static/bwr/es5-shim/es5-shim.js line length is 290 characters (>256)
lemonldap-ng source: insane-line-length-in-source-file lemonldap-ng-portal/site/htdocs/static/bwr/jquery-ui/jquery-ui.js line length is 1002 characters (>512)
lemonldap-ng source: source-is-missing po-doc/fr/pages/documentation/current/lib/tpl/bootstrap3/assets/bootstrap/js/bootstrap.min.js

View File

@ -6,9 +6,9 @@ Test-Command: ./debian/tests/runner runtime-deps
Depends: @, pkg-perl-autopkgtest, libmouse-perl
# Use pkg-perl-autopkgtest test for runtime-deps-and-recommends
# Some portal suggested dependencies are added here
Test-Command: /usr/share/pkg-perl-autopkgtest/runner runtime-deps-and-recommends
Depends: @, @builddeps@, pkg-perl-autopkgtest, libmouse-perl, libcache-memcached-perl, libauthen-pam-perl, libauthen-radius-perl, libweb-id-perl, libyaml-perl
Restrictions: needs-recommends
Depends: @, @builddeps@, pkg-perl-autopkgtest, libyaml-perl, liblog-log4perl-perl, libauthen-pam-perl, libauthen-radius-perl, libweb-id-perl
#Test-Command: ./debian/tests/runner heavy-deps
#Depends: @, pkg-perl-autopkgtest, pkg-perl-autopkgtest-heavy, libmouse-perl

View File

@ -0,0 +1 @@
runtime-deps.d

View File

@ -3,6 +3,9 @@ ApacheMP2
Common/Logger/Sentry.pm
Handler/Lib/SecureToken.pm
Handler/Server/SecureToken.pm
Lemonldap/NG/Handler.pm
ZimbraPreAuth.pm
Portal/Lib/Captcha.pm
Portal/Main/Run
Portal/Main/Init
Portal/Main/Display