add python-youbico to bdeps, add two patches to fix build a bit

This commit is contained in:
Timo Aaltonen
2014-07-01 18:47:40 +03:00
parent 7aef5fda04
commit 4db505de90
4 changed files with 24 additions and 0 deletions

1
debian/control vendored
View File

@@ -34,6 +34,7 @@ Build-Depends: quilt, debhelper (>= 9), dh-autoreconf,
python-setuptools,
python-sss (>= 1.8.0),
python-support,
python-yubico,
# server
389-ds-base-dev (>= 1.1.3),
libkrad-dev,

11
debian/patches/fix-match-hostname.diff vendored Normal file
View File

@@ -0,0 +1,11 @@
--- a/ipalib/plugins/otptoken.py
+++ b/ipalib/plugins/otptoken.py
@@ -25,7 +25,7 @@ from ipalib.errors import PasswordMismat
from ipalib.request import context
from ipalib.frontend import Local
-from backports.ssl_match_hostname import match_hostname
+from ssl import match_hostname
import base64
import uuid
import urllib

10
debian/patches/fix-rhino-path.diff vendored Normal file
View File

@@ -0,0 +1,10 @@
--- a/install/ui/util/build.sh
+++ b/install/ui/util/build.sh
@@ -31,6 +31,6 @@ if [[ ! $profile ]] ; then
exit 1
fi
-RHINO="java -Xss${JAVA_STACK_SIZE:-512k} -classpath /usr/share/java/rhino.jar org.mozilla.javascript.tools.shell.Main"
+RHINO="java -Xss${JAVA_STACK_SIZE:-512k} -classpath /usr/share/java/js.jar org.mozilla.javascript.tools.shell.Main"
$RHINO $DIR/build/build.js baseUrl=$DIR/build load=build profile=$DIR/../src/$profile.profile.js
exit $?

View File

@@ -9,3 +9,5 @@ check-dbus-before-starting.diff
add-debian-platform.diff
fix-pykerberos-api.diff
fix-match-hostname.diff
fix-rhino-path.diff