Page MenuHomeFreeBSD

D53807.id166895.diff
No OneTemporary

D53807.id166895.diff

Index: security/autofirma/Makefile
===================================================================
--- security/autofirma/Makefile
+++ security/autofirma/Makefile
@@ -16,15 +16,13 @@
JAVA_VERSION= 24
JAVA_VENDOR= openjdk
-KEYSTORE_FILENAME= afirma-keystore.jks
-KEYSTORE= ${DATADIR}/${KEYSTORE_FILENAME}
-
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
+NO_BUILD= yes
+
SUB_FILES= ${PORTNAME} \
Autofirma.js
-SUB_LIST+= KEYSTORE=${KEYSTORE} \
- BIN_PATH=${PREFIX}/bin
+SUB_LIST+= BIN_PATH=${PREFIX}/bin
WRKSRC=${WRKDIR}
@@ -32,22 +30,8 @@
${TAR} -C ${WRKDIR} -xvzf ${WRKDIR}/autofirma_1_9.deb
${TAR} -C ${WRKDIR} -xvzf ${WRKDIR}/data.tar.gz
-do-build:
- # Create a key store with a dummy key
- ${JAVA_KEYTOOL} -genkeypair -alias afirmaks -keystore \
- ${WRKDIR}/${KEYSTORE_FILENAME} -storepass changeit \
- -keypass changeit -dname "CN=temp" -keyalg RSA
-
- # # Import each certificate
- for cert in /usr/share/certs/trusted/Sec*.pem; do \
- ${JAVA_KEYTOOL} -importcert -noprompt -trustcacerts -file \
- "$$cert" -alias "$$(basename "$$cert")" \
- -keystore ${WRKDIR}/${KEYSTORE_FILENAME} -storepass changeit; \
- done
-
do-install:
${MKDIR} ${STAGEDIR}${DATADIR}
- ${INSTALL_DATA} ${WRKDIR}/${KEYSTORE_FILENAME} ${STAGEDIR}${KEYSTORE}
${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
${INSTALL_DATA} ${WRKSRC}/usr/lib/Autofirma/autofirma.jar ${STAGEDIR}${JAVAJARDIR}
${INSTALL_DATA} ${WRKSRC}/usr/lib/Autofirma/Autofirma.png ${STAGEDIR}${DATADIR}
Index: security/autofirma/files/autofirma.in
===================================================================
--- security/autofirma/files/autofirma.in
+++ security/autofirma/files/autofirma.in
@@ -1,9 +1,9 @@
#!/bin/sh
export AFIRMA_NSS_HOME_ENV=%%LOCALBASE%%/lib/
+JAVA_CERTS=%%JAVA_HOME%%/lib/security/cacerts
JAVA_CMD=$(which java)
JAVA_OPTS="-Djavax.net.ssl.trustStoreType=JKS \
- -Djavax.net.ssl.trustStore=%%KEYSTORE%% \
- -Djavax.net.ssl.trustStorePassword=changeit \
+ -Djavax.net.ssl.trustStore=$JAVA_CERTS \
-Dmozilla.cfg.dir=%%LOCALBASE%%/lib \
-Djdk.tls.maxHandshakeMessageSize=65536 \
-Des.gob.afirma.keystores.mozilla.UseEnvironmentVariables=true"
Index: security/autofirma/pkg-plist
===================================================================
--- security/autofirma/pkg-plist
+++ security/autofirma/pkg-plist
@@ -2,5 +2,4 @@
share/applications/afirma.desktop
%%DATADIR%%/Autofirma.js
%%DATADIR%%/Autofirma.png
-%%DATADIR%%/afirma-keystore.jks
%%JAVAJARDIR%%/autofirma.jar

File Metadata

Mime Type
text/plain
Expires
Mon, Aug 3, 12:44 AM (17 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35863068
Default Alt Text
D53807.id166895.diff (2 KB)

Event Timeline