Skip to content

[pkg] fix: drop dependency on ca-certificates-java #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[pkg] fix: drop dependency on ca-certificates-java #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions packaging/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ Package: @@package@@
Architecture: armel
Multi-Arch: same
Pre-Depends: ${dpkg:Depends}
Depends: ${cacert:Depends},
${jcommon:Depends}, ${dlopenhl:Depends},
Depends: ${jcommon:Depends}, ${dlopenhl:Depends},
${mountpoint:Depends},
${shlibs:Depends}, ${misc:Depends}
Recommends: ${dlopenhl:Recommends}
Expand Down
5 changes: 0 additions & 5 deletions packaging/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ dlopen_hl_recommends =

control_vars = '-Vdlopenhl:Depends=$(dlopen_hl_depends)'
control_vars += '-Vdlopenhl:Recommends=$(dlopen_hl_recommends)'
control_vars += '-Vcacert:Depends=ca-certificates-java'
control_vars += '-Vmountpoint:Depends=util-linux (>= 2.26.2-4)'
control_vars += '-Vjcommon:Depends=java-common (>= 0.28)'
control_vars += '-Vdefaultvm:Provides='
Expand Down Expand Up @@ -51,9 +50,6 @@ copy_java: binary-pre mkdirs
cp -rf bin conf legal lib release metadata debian/$(pkgname)/usr/lib/jvm/$(pkgname)/

mkcustom: binary-pre mkdirs copy_java templates
# ca certificates
rm debian/$(pkgname)/usr/lib/jvm/$(pkgname)/lib/security/cacerts
ln -s /etc/ssl/certs/java/cacerts debian/$(pkgname)/usr/lib/jvm/$(pkgname)/lib/security/cacerts
# custom config
install -o root -g root -m 0644 debian/nss.cfg debian/$(pkgname)/etc/$(pkgname)/security/nss.cfg
install -o root -g root -m 0644 debian/jvm.cfg debian/$(pkgname)/etc/$(pkgname)/jvm.cfg
Expand All @@ -72,7 +68,6 @@ mkcustom: binary-pre mkdirs copy_java templates
conf/logging.properties \
conf/net.properties \
conf/sound.properties \
lib/security/cacerts \
lib/security/blacklisted.certs \
lib/security/default.policy \
lib/security/public_suffix_list.dat \
Expand Down