[gentoo-commits] gentoo-x86 commit in eclass: ssl-cert.eclass
vapier 14/03/20 19:30:33
Modified: ssl-cert.eclass
Log:
misc style fixes -- do not hardcode full path to `openssl`
Revision ChangesPath
1.21 eclass/ssl-cert.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.21&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.21&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?r1=1.20&r2=1.21
Index: ssl-cert.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ssl-cert.eclass 3 Jan 2013 19:19:55 - 1.20
+++ ssl-cert.eclass 20 Mar 2014 19:30:32 - 1.21
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.20 2013/01/03
19:19:55 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.21 2014/03/20
19:30:32 vapier Exp $
# @ECLASS: ssl-cert.eclass
# @MAINTAINER:
@@ -16,16 +16,14 @@
# @ECLASS-VARIABLE: SSL_CERT_MANDATORY
# @DESCRIPTION:
# Set to non zero if ssl-cert is mandatory for ebuild.
-#
-SSL_CERT_MANDATORY="${SSL_CERT_MANDATORY:-0}"
+: ${SSL_CERT_MANDATORY:=0}
# @ECLASS-VARIABLE: SSL_CERT_USE
# @DESCRIPTION:
# Use flag to append dependency to.
-#
-SSL_CERT_USE="${SSL_CERT_USE:-ssl}"
+: ${SSL_CERT_USE:=ssl}
-if [[ "${SSL_CERT_MANDATORY}" = 0 ]]; then
+if [[ "${SSL_CERT_MANDATORY}" == "0" ]]; then
DEPEND="${SSL_CERT_USE}? ( dev-libs/openssl )"
IUSE="${SSL_CERT_USE}"
else
@@ -108,7 +106,7 @@
gen_key() {
local base=`get_base $1`
ebegin "Generating ${SSL_BITS} bit RSA key${1:+ for CA}"
- /usr/bin/openssl genrsa -rand "${SSL_RANDOM}" \
+ openssl genrsa -rand "${SSL_RANDOM}" \
-out "${base}.key" "${SSL_BITS}" &> /dev/null
eend $?
@@ -125,7 +123,7 @@
gen_csr() {
local base=`get_base $1`
ebegin "Generating Certificate Signing Request${1:+ for CA}"
- /usr/bin/openssl req -config "${SSL_CONF}" -new \
+ openssl req -config "${SSL_CONF}" -new \
-key "${base}.key" -out "${base}.csr" &>/dev/null
eend $?
@@ -145,13 +143,13 @@
local base=`get_base $1`
if [ "${1}" ] ; then
ebegin "Generating self-signed X.509 Certificate for CA"
- /usr/bin/openssl x509 -extfile "${SSL_CONF}" \
+ openssl x509 -extfile "${SSL_CONF}" \
-days ${SSL_DAYS} -req -signkey "${base}.key" \
-in "${base}.csr" -out "${base}.crt" &>/dev/null
else
local ca=`get_base 1`
ebegin "Generating authority-signed X.509 Certificate"
- /usr/bin/openssl x509 -extfile "${SSL_CONF}" \
+ openssl x509 -extfile "${SSL_CONF}" \
-days ${SSL_DAYS} -req -CAserial "${SSL_SERIAL}" \
-CAkey "${ca}.key" -CA "${ca}.crt" \
-in "${base}.csr" -out "${base}.crt" &>/dev/null
@@ -246,7 +244,7 @@
install -m0444 "${base}.csr" "${ROOT}${cert}.csr"
install -m0444 "${base}.crt" "${ROOT}${cert}.crt"
install -m0400 "${base}.pem" "${ROOT}${cert}.pem"
- count=$((${count}+1))
+ : $(( ++count ))
done
# Resulting status
[gentoo-commits] gentoo-x86 commit in eclass: ssl-cert.eclass
vapier 14/03/20 19:30:56
Modified: ssl-cert.eclass
Log:
drop long dead docert func
Revision ChangesPath
1.22 eclass/ssl-cert.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.22&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.22&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?r1=1.21&r2=1.22
Index: ssl-cert.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ssl-cert.eclass 20 Mar 2014 19:30:32 - 1.21
+++ ssl-cert.eclass 20 Mar 2014 19:30:56 - 1.22
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.21 2014/03/20
19:30:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.22 2014/03/20
19:30:56 vapier Exp $
# @ECLASS: ssl-cert.eclass
# @MAINTAINER:
@@ -175,13 +175,6 @@
return $?
}
-# Removed due to bug 174759
-docert() {
- eerror "Function \"docert\" has been removed for security reasons."
- eerror "\"install_cert\" should be used instead. See bug 174759."
- die
-}
-
# @FUNCTION: install_cert
# @USAGE:
# @DESCRIPTION:
[gentoo-commits] gentoo-x86 commit in eclass: ssl-cert.eclass
vapier 14/03/20 19:32:09
Modified: ssl-cert.eclass
Log:
update banned list of src funcs install_cert is banned in, and upgrade the
call to a `die`
Revision ChangesPath
1.23 eclass/ssl-cert.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.23&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.23&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?r1=1.22&r2=1.23
Index: ssl-cert.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ssl-cert.eclass 20 Mar 2014 19:30:56 - 1.22
+++ ssl-cert.eclass 20 Mar 2014 19:32:09 - 1.23
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.22 2014/03/20
19:30:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.23 2014/03/20
19:32:09 vapier Exp $
# @ECLASS: ssl-cert.eclass
# @MAINTAINER:
@@ -192,9 +192,9 @@
fi
case ${EBUILD_PHASE} in
- unpack|compile|test|install)
- eerror "install_cert cannot be called in
${EBUILD_PHASE}"
- return 1 ;;
+ unpack|prepare|configure|compile|test|install)
+ die "install_cert cannot be called in ${EBUILD_PHASE}"
+ ;;
esac
# Generate a CA environment #164601
[gentoo-commits] gentoo-x86 commit in eclass: ssl-cert.eclass
vapier 14/03/20 19:33:13
Modified: ssl-cert.eclass
Log:
style fix: change `...` to $(...)
Revision ChangesPath
1.24 eclass/ssl-cert.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.24&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.24&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?r1=1.23&r2=1.24
Index: ssl-cert.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ssl-cert.eclass 20 Mar 2014 19:32:09 - 1.23
+++ ssl-cert.eclass 20 Mar 2014 19:33:13 - 1.24
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.23 2014/03/20
19:32:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.24 2014/03/20
19:33:13 vapier Exp $
# @ECLASS: ssl-cert.eclass
# @MAINTAINER:
@@ -104,7 +104,7 @@
#
# Access: private
gen_key() {
- local base=`get_base $1`
+ local base=$(get_base "$1")
ebegin "Generating ${SSL_BITS} bit RSA key${1:+ for CA}"
openssl genrsa -rand "${SSL_RANDOM}" \
-out "${base}.key" "${SSL_BITS}" &> /dev/null
@@ -121,7 +121,7 @@
#
# Access: private
gen_csr() {
- local base=`get_base $1`
+ local base=$(get_base "$1")
ebegin "Generating Certificate Signing Request${1:+ for CA}"
openssl req -config "${SSL_CONF}" -new \
-key "${base}.key" -out "${base}.csr" &>/dev/null
@@ -140,14 +140,14 @@
#
# Access: private
gen_crt() {
- local base=`get_base $1`
+ local base=$(get_base "$1")
if [ "${1}" ] ; then
ebegin "Generating self-signed X.509 Certificate for CA"
openssl x509 -extfile "${SSL_CONF}" \
-days ${SSL_DAYS} -req -signkey "${base}.key" \
-in "${base}.csr" -out "${base}.crt" &>/dev/null
else
- local ca=`get_base 1`
+ local ca=$(get_base 1)
ebegin "Generating authority-signed X.509 Certificate"
openssl x509 -extfile "${SSL_CONF}" \
-days ${SSL_DAYS} -req -CAserial "${SSL_SERIAL}" \
@@ -167,7 +167,7 @@
#
# Access: private
gen_pem() {
- local base=`get_base $1`
+ local base=$(get_base "$1")
ebegin "Generating PEM Certificate"
(cat "${base}.key"; echo; cat "${base}.crt") > "${base}.pem"
eend $?
[gentoo-commits] gentoo-x86 commit in eclass: ssl-cert.eclass
vapier 14/03/20 19:30:33
Modified: ssl-cert.eclass
Log:
misc style fixes -- do not hardcode full path to `openssl`
Revision ChangesPath
1.21 eclass/ssl-cert.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.21&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.21&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?r1=1.20&r2=1.21
Index: ssl-cert.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ssl-cert.eclass 3 Jan 2013 19:19:55 - 1.20
+++ ssl-cert.eclass 20 Mar 2014 19:30:32 - 1.21
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.20 2013/01/03
19:19:55 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.21 2014/03/20
19:30:32 vapier Exp $
# @ECLASS: ssl-cert.eclass
# @MAINTAINER:
@@ -16,16 +16,14 @@
# @ECLASS-VARIABLE: SSL_CERT_MANDATORY
# @DESCRIPTION:
# Set to non zero if ssl-cert is mandatory for ebuild.
-#
-SSL_CERT_MANDATORY="${SSL_CERT_MANDATORY:-0}"
+: ${SSL_CERT_MANDATORY:=0}
# @ECLASS-VARIABLE: SSL_CERT_USE
# @DESCRIPTION:
# Use flag to append dependency to.
-#
-SSL_CERT_USE="${SSL_CERT_USE:-ssl}"
+: ${SSL_CERT_USE:=ssl}
-if [[ "${SSL_CERT_MANDATORY}" = 0 ]]; then
+if [[ "${SSL_CERT_MANDATORY}" == "0" ]]; then
DEPEND="${SSL_CERT_USE}? ( dev-libs/openssl )"
IUSE="${SSL_CERT_USE}"
else
@@ -108,7 +106,7 @@
gen_key() {
local base=`get_base $1`
ebegin "Generating ${SSL_BITS} bit RSA key${1:+ for CA}"
- /usr/bin/openssl genrsa -rand "${SSL_RANDOM}" \
+ openssl genrsa -rand "${SSL_RANDOM}" \
-out "${base}.key" "${SSL_BITS}" &> /dev/null
eend $?
@@ -125,7 +123,7 @@
gen_csr() {
local base=`get_base $1`
ebegin "Generating Certificate Signing Request${1:+ for CA}"
- /usr/bin/openssl req -config "${SSL_CONF}" -new \
+ openssl req -config "${SSL_CONF}" -new \
-key "${base}.key" -out "${base}.csr" &>/dev/null
eend $?
@@ -145,13 +143,13 @@
local base=`get_base $1`
if [ "${1}" ] ; then
ebegin "Generating self-signed X.509 Certificate for CA"
- /usr/bin/openssl x509 -extfile "${SSL_CONF}" \
+ openssl x509 -extfile "${SSL_CONF}" \
-days ${SSL_DAYS} -req -signkey "${base}.key" \
-in "${base}.csr" -out "${base}.crt" &>/dev/null
else
local ca=`get_base 1`
ebegin "Generating authority-signed X.509 Certificate"
- /usr/bin/openssl x509 -extfile "${SSL_CONF}" \
+ openssl x509 -extfile "${SSL_CONF}" \
-days ${SSL_DAYS} -req -CAserial "${SSL_SERIAL}" \
-CAkey "${ca}.key" -CA "${ca}.crt" \
-in "${base}.csr" -out "${base}.crt" &>/dev/null
@@ -246,7 +244,7 @@
install -m0444 "${base}.csr" "${ROOT}${cert}.csr"
install -m0444 "${base}.crt" "${ROOT}${cert}.crt"
install -m0400 "${base}.pem" "${ROOT}${cert}.pem"
- count=$((${count}+1))
+ : $(( ++count ))
done
# Resulting status
[gentoo-commits] gentoo-x86 commit in eclass: ssl-cert.eclass
vapier 14/03/20 19:30:56
Modified: ssl-cert.eclass
Log:
drop long dead docert func
Revision ChangesPath
1.22 eclass/ssl-cert.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.22&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.22&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?r1=1.21&r2=1.22
Index: ssl-cert.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ssl-cert.eclass 20 Mar 2014 19:30:32 - 1.21
+++ ssl-cert.eclass 20 Mar 2014 19:30:56 - 1.22
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.21 2014/03/20
19:30:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.22 2014/03/20
19:30:56 vapier Exp $
# @ECLASS: ssl-cert.eclass
# @MAINTAINER:
@@ -175,13 +175,6 @@
return $?
}
-# Removed due to bug 174759
-docert() {
- eerror "Function \"docert\" has been removed for security reasons."
- eerror "\"install_cert\" should be used instead. See bug 174759."
- die
-}
-
# @FUNCTION: install_cert
# @USAGE:
# @DESCRIPTION:
[gentoo-commits] gentoo-x86 commit in eclass: ssl-cert.eclass
vapier 14/03/20 19:32:09
Modified: ssl-cert.eclass
Log:
update banned list of src funcs install_cert is banned in, and upgrade the
call to a `die`
Revision ChangesPath
1.23 eclass/ssl-cert.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.23&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.23&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?r1=1.22&r2=1.23
Index: ssl-cert.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ssl-cert.eclass 20 Mar 2014 19:30:56 - 1.22
+++ ssl-cert.eclass 20 Mar 2014 19:32:09 - 1.23
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.22 2014/03/20
19:30:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.23 2014/03/20
19:32:09 vapier Exp $
# @ECLASS: ssl-cert.eclass
# @MAINTAINER:
@@ -192,9 +192,9 @@
fi
case ${EBUILD_PHASE} in
- unpack|compile|test|install)
- eerror "install_cert cannot be called in
${EBUILD_PHASE}"
- return 1 ;;
+ unpack|prepare|configure|compile|test|install)
+ die "install_cert cannot be called in ${EBUILD_PHASE}"
+ ;;
esac
# Generate a CA environment #164601
[gentoo-commits] gentoo-x86 commit in eclass: ssl-cert.eclass
vapier 14/03/20 19:33:13
Modified: ssl-cert.eclass
Log:
style fix: change `...` to $(...)
Revision ChangesPath
1.24 eclass/ssl-cert.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.24&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.24&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?r1=1.23&r2=1.24
Index: ssl-cert.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ssl-cert.eclass 20 Mar 2014 19:32:09 - 1.23
+++ ssl-cert.eclass 20 Mar 2014 19:33:13 - 1.24
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.23 2014/03/20
19:32:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.24 2014/03/20
19:33:13 vapier Exp $
# @ECLASS: ssl-cert.eclass
# @MAINTAINER:
@@ -104,7 +104,7 @@
#
# Access: private
gen_key() {
- local base=`get_base $1`
+ local base=$(get_base "$1")
ebegin "Generating ${SSL_BITS} bit RSA key${1:+ for CA}"
openssl genrsa -rand "${SSL_RANDOM}" \
-out "${base}.key" "${SSL_BITS}" &> /dev/null
@@ -121,7 +121,7 @@
#
# Access: private
gen_csr() {
- local base=`get_base $1`
+ local base=$(get_base "$1")
ebegin "Generating Certificate Signing Request${1:+ for CA}"
openssl req -config "${SSL_CONF}" -new \
-key "${base}.key" -out "${base}.csr" &>/dev/null
@@ -140,14 +140,14 @@
#
# Access: private
gen_crt() {
- local base=`get_base $1`
+ local base=$(get_base "$1")
if [ "${1}" ] ; then
ebegin "Generating self-signed X.509 Certificate for CA"
openssl x509 -extfile "${SSL_CONF}" \
-days ${SSL_DAYS} -req -signkey "${base}.key" \
-in "${base}.csr" -out "${base}.crt" &>/dev/null
else
- local ca=`get_base 1`
+ local ca=$(get_base 1)
ebegin "Generating authority-signed X.509 Certificate"
openssl x509 -extfile "${SSL_CONF}" \
-days ${SSL_DAYS} -req -CAserial "${SSL_SERIAL}" \
@@ -167,7 +167,7 @@
#
# Access: private
gen_pem() {
- local base=`get_base $1`
+ local base=$(get_base "$1")
ebegin "Generating PEM Certificate"
(cat "${base}.key"; echo; cat "${base}.crt") > "${base}.pem"
eend $?
[gentoo-commits] gentoo-x86 commit in eclass: ssl-cert.eclass
vapier 14/03/20 19:30:33
Modified: ssl-cert.eclass
Log:
misc style fixes -- do not hardcode full path to `openssl`
Revision ChangesPath
1.21 eclass/ssl-cert.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.21&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.21&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?r1=1.20&r2=1.21
Index: ssl-cert.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ssl-cert.eclass 3 Jan 2013 19:19:55 - 1.20
+++ ssl-cert.eclass 20 Mar 2014 19:30:32 - 1.21
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.20 2013/01/03
19:19:55 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.21 2014/03/20
19:30:32 vapier Exp $
# @ECLASS: ssl-cert.eclass
# @MAINTAINER:
@@ -16,16 +16,14 @@
# @ECLASS-VARIABLE: SSL_CERT_MANDATORY
# @DESCRIPTION:
# Set to non zero if ssl-cert is mandatory for ebuild.
-#
-SSL_CERT_MANDATORY="${SSL_CERT_MANDATORY:-0}"
+: ${SSL_CERT_MANDATORY:=0}
# @ECLASS-VARIABLE: SSL_CERT_USE
# @DESCRIPTION:
# Use flag to append dependency to.
-#
-SSL_CERT_USE="${SSL_CERT_USE:-ssl}"
+: ${SSL_CERT_USE:=ssl}
-if [[ "${SSL_CERT_MANDATORY}" = 0 ]]; then
+if [[ "${SSL_CERT_MANDATORY}" == "0" ]]; then
DEPEND="${SSL_CERT_USE}? ( dev-libs/openssl )"
IUSE="${SSL_CERT_USE}"
else
@@ -108,7 +106,7 @@
gen_key() {
local base=`get_base $1`
ebegin "Generating ${SSL_BITS} bit RSA key${1:+ for CA}"
- /usr/bin/openssl genrsa -rand "${SSL_RANDOM}" \
+ openssl genrsa -rand "${SSL_RANDOM}" \
-out "${base}.key" "${SSL_BITS}" &> /dev/null
eend $?
@@ -125,7 +123,7 @@
gen_csr() {
local base=`get_base $1`
ebegin "Generating Certificate Signing Request${1:+ for CA}"
- /usr/bin/openssl req -config "${SSL_CONF}" -new \
+ openssl req -config "${SSL_CONF}" -new \
-key "${base}.key" -out "${base}.csr" &>/dev/null
eend $?
@@ -145,13 +143,13 @@
local base=`get_base $1`
if [ "${1}" ] ; then
ebegin "Generating self-signed X.509 Certificate for CA"
- /usr/bin/openssl x509 -extfile "${SSL_CONF}" \
+ openssl x509 -extfile "${SSL_CONF}" \
-days ${SSL_DAYS} -req -signkey "${base}.key" \
-in "${base}.csr" -out "${base}.crt" &>/dev/null
else
local ca=`get_base 1`
ebegin "Generating authority-signed X.509 Certificate"
- /usr/bin/openssl x509 -extfile "${SSL_CONF}" \
+ openssl x509 -extfile "${SSL_CONF}" \
-days ${SSL_DAYS} -req -CAserial "${SSL_SERIAL}" \
-CAkey "${ca}.key" -CA "${ca}.crt" \
-in "${base}.csr" -out "${base}.crt" &>/dev/null
@@ -246,7 +244,7 @@
install -m0444 "${base}.csr" "${ROOT}${cert}.csr"
install -m0444 "${base}.crt" "${ROOT}${cert}.crt"
install -m0400 "${base}.pem" "${ROOT}${cert}.pem"
- count=$((${count}+1))
+ : $(( ++count ))
done
# Resulting status
[gentoo-commits] gentoo-x86 commit in eclass: ssl-cert.eclass
vapier 14/03/20 19:30:56
Modified: ssl-cert.eclass
Log:
drop long dead docert func
Revision ChangesPath
1.22 eclass/ssl-cert.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.22&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.22&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?r1=1.21&r2=1.22
Index: ssl-cert.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ssl-cert.eclass 20 Mar 2014 19:30:32 - 1.21
+++ ssl-cert.eclass 20 Mar 2014 19:30:56 - 1.22
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.21 2014/03/20
19:30:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.22 2014/03/20
19:30:56 vapier Exp $
# @ECLASS: ssl-cert.eclass
# @MAINTAINER:
@@ -175,13 +175,6 @@
return $?
}
-# Removed due to bug 174759
-docert() {
- eerror "Function \"docert\" has been removed for security reasons."
- eerror "\"install_cert\" should be used instead. See bug 174759."
- die
-}
-
# @FUNCTION: install_cert
# @USAGE:
# @DESCRIPTION:
[gentoo-commits] gentoo-x86 commit in eclass: ssl-cert.eclass
vapier 14/03/20 19:32:09
Modified: ssl-cert.eclass
Log:
update banned list of src funcs install_cert is banned in, and upgrade the
call to a `die`
Revision ChangesPath
1.23 eclass/ssl-cert.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.23&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.23&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?r1=1.22&r2=1.23
Index: ssl-cert.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ssl-cert.eclass 20 Mar 2014 19:30:56 - 1.22
+++ ssl-cert.eclass 20 Mar 2014 19:32:09 - 1.23
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.22 2014/03/20
19:30:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.23 2014/03/20
19:32:09 vapier Exp $
# @ECLASS: ssl-cert.eclass
# @MAINTAINER:
@@ -192,9 +192,9 @@
fi
case ${EBUILD_PHASE} in
- unpack|compile|test|install)
- eerror "install_cert cannot be called in
${EBUILD_PHASE}"
- return 1 ;;
+ unpack|prepare|configure|compile|test|install)
+ die "install_cert cannot be called in ${EBUILD_PHASE}"
+ ;;
esac
# Generate a CA environment #164601
[gentoo-commits] gentoo-x86 commit in eclass: ssl-cert.eclass
vapier 14/03/20 19:33:13
Modified: ssl-cert.eclass
Log:
style fix: change `...` to $(...)
Revision ChangesPath
1.24 eclass/ssl-cert.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.24&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.24&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?r1=1.23&r2=1.24
Index: ssl-cert.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ssl-cert.eclass 20 Mar 2014 19:32:09 - 1.23
+++ ssl-cert.eclass 20 Mar 2014 19:33:13 - 1.24
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.23 2014/03/20
19:32:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.24 2014/03/20
19:33:13 vapier Exp $
# @ECLASS: ssl-cert.eclass
# @MAINTAINER:
@@ -104,7 +104,7 @@
#
# Access: private
gen_key() {
- local base=`get_base $1`
+ local base=$(get_base "$1")
ebegin "Generating ${SSL_BITS} bit RSA key${1:+ for CA}"
openssl genrsa -rand "${SSL_RANDOM}" \
-out "${base}.key" "${SSL_BITS}" &> /dev/null
@@ -121,7 +121,7 @@
#
# Access: private
gen_csr() {
- local base=`get_base $1`
+ local base=$(get_base "$1")
ebegin "Generating Certificate Signing Request${1:+ for CA}"
openssl req -config "${SSL_CONF}" -new \
-key "${base}.key" -out "${base}.csr" &>/dev/null
@@ -140,14 +140,14 @@
#
# Access: private
gen_crt() {
- local base=`get_base $1`
+ local base=$(get_base "$1")
if [ "${1}" ] ; then
ebegin "Generating self-signed X.509 Certificate for CA"
openssl x509 -extfile "${SSL_CONF}" \
-days ${SSL_DAYS} -req -signkey "${base}.key" \
-in "${base}.csr" -out "${base}.crt" &>/dev/null
else
- local ca=`get_base 1`
+ local ca=$(get_base 1)
ebegin "Generating authority-signed X.509 Certificate"
openssl x509 -extfile "${SSL_CONF}" \
-days ${SSL_DAYS} -req -CAserial "${SSL_SERIAL}" \
@@ -167,7 +167,7 @@
#
# Access: private
gen_pem() {
- local base=`get_base $1`
+ local base=$(get_base "$1")
ebegin "Generating PEM Certificate"
(cat "${base}.key"; echo; cat "${base}.crt") > "${base}.pem"
eend $?
[gentoo-commits] gentoo-x86 commit in eclass: ssl-cert.eclass
vapier 14/03/20 19:30:33
Modified: ssl-cert.eclass
Log:
misc style fixes -- do not hardcode full path to `openssl`
Revision ChangesPath
1.21 eclass/ssl-cert.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.21&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.21&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?r1=1.20&r2=1.21
Index: ssl-cert.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ssl-cert.eclass 3 Jan 2013 19:19:55 - 1.20
+++ ssl-cert.eclass 20 Mar 2014 19:30:32 - 1.21
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.20 2013/01/03
19:19:55 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.21 2014/03/20
19:30:32 vapier Exp $
# @ECLASS: ssl-cert.eclass
# @MAINTAINER:
@@ -16,16 +16,14 @@
# @ECLASS-VARIABLE: SSL_CERT_MANDATORY
# @DESCRIPTION:
# Set to non zero if ssl-cert is mandatory for ebuild.
-#
-SSL_CERT_MANDATORY="${SSL_CERT_MANDATORY:-0}"
+: ${SSL_CERT_MANDATORY:=0}
# @ECLASS-VARIABLE: SSL_CERT_USE
# @DESCRIPTION:
# Use flag to append dependency to.
-#
-SSL_CERT_USE="${SSL_CERT_USE:-ssl}"
+: ${SSL_CERT_USE:=ssl}
-if [[ "${SSL_CERT_MANDATORY}" = 0 ]]; then
+if [[ "${SSL_CERT_MANDATORY}" == "0" ]]; then
DEPEND="${SSL_CERT_USE}? ( dev-libs/openssl )"
IUSE="${SSL_CERT_USE}"
else
@@ -108,7 +106,7 @@
gen_key() {
local base=`get_base $1`
ebegin "Generating ${SSL_BITS} bit RSA key${1:+ for CA}"
- /usr/bin/openssl genrsa -rand "${SSL_RANDOM}" \
+ openssl genrsa -rand "${SSL_RANDOM}" \
-out "${base}.key" "${SSL_BITS}" &> /dev/null
eend $?
@@ -125,7 +123,7 @@
gen_csr() {
local base=`get_base $1`
ebegin "Generating Certificate Signing Request${1:+ for CA}"
- /usr/bin/openssl req -config "${SSL_CONF}" -new \
+ openssl req -config "${SSL_CONF}" -new \
-key "${base}.key" -out "${base}.csr" &>/dev/null
eend $?
@@ -145,13 +143,13 @@
local base=`get_base $1`
if [ "${1}" ] ; then
ebegin "Generating self-signed X.509 Certificate for CA"
- /usr/bin/openssl x509 -extfile "${SSL_CONF}" \
+ openssl x509 -extfile "${SSL_CONF}" \
-days ${SSL_DAYS} -req -signkey "${base}.key" \
-in "${base}.csr" -out "${base}.crt" &>/dev/null
else
local ca=`get_base 1`
ebegin "Generating authority-signed X.509 Certificate"
- /usr/bin/openssl x509 -extfile "${SSL_CONF}" \
+ openssl x509 -extfile "${SSL_CONF}" \
-days ${SSL_DAYS} -req -CAserial "${SSL_SERIAL}" \
-CAkey "${ca}.key" -CA "${ca}.crt" \
-in "${base}.csr" -out "${base}.crt" &>/dev/null
@@ -246,7 +244,7 @@
install -m0444 "${base}.csr" "${ROOT}${cert}.csr"
install -m0444 "${base}.crt" "${ROOT}${cert}.crt"
install -m0400 "${base}.pem" "${ROOT}${cert}.pem"
- count=$((${count}+1))
+ : $(( ++count ))
done
# Resulting status
[gentoo-commits] gentoo-x86 commit in eclass: ssl-cert.eclass
vapier 14/03/20 19:30:56
Modified: ssl-cert.eclass
Log:
drop long dead docert func
Revision ChangesPath
1.22 eclass/ssl-cert.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.22&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.22&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?r1=1.21&r2=1.22
Index: ssl-cert.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ssl-cert.eclass 20 Mar 2014 19:30:32 - 1.21
+++ ssl-cert.eclass 20 Mar 2014 19:30:56 - 1.22
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.21 2014/03/20
19:30:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.22 2014/03/20
19:30:56 vapier Exp $
# @ECLASS: ssl-cert.eclass
# @MAINTAINER:
@@ -175,13 +175,6 @@
return $?
}
-# Removed due to bug 174759
-docert() {
- eerror "Function \"docert\" has been removed for security reasons."
- eerror "\"install_cert\" should be used instead. See bug 174759."
- die
-}
-
# @FUNCTION: install_cert
# @USAGE:
# @DESCRIPTION:
[gentoo-commits] gentoo-x86 commit in eclass: ssl-cert.eclass
vapier 14/03/20 19:32:09
Modified: ssl-cert.eclass
Log:
update banned list of src funcs install_cert is banned in, and upgrade the
call to a `die`
Revision ChangesPath
1.23 eclass/ssl-cert.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.23&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.23&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?r1=1.22&r2=1.23
Index: ssl-cert.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ssl-cert.eclass 20 Mar 2014 19:30:56 - 1.22
+++ ssl-cert.eclass 20 Mar 2014 19:32:09 - 1.23
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.22 2014/03/20
19:30:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.23 2014/03/20
19:32:09 vapier Exp $
# @ECLASS: ssl-cert.eclass
# @MAINTAINER:
@@ -192,9 +192,9 @@
fi
case ${EBUILD_PHASE} in
- unpack|compile|test|install)
- eerror "install_cert cannot be called in
${EBUILD_PHASE}"
- return 1 ;;
+ unpack|prepare|configure|compile|test|install)
+ die "install_cert cannot be called in ${EBUILD_PHASE}"
+ ;;
esac
# Generate a CA environment #164601
[gentoo-commits] gentoo-x86 commit in eclass: ssl-cert.eclass
vapier 14/03/20 19:33:13
Modified: ssl-cert.eclass
Log:
style fix: change `...` to $(...)
Revision ChangesPath
1.24 eclass/ssl-cert.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.24&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.24&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?r1=1.23&r2=1.24
Index: ssl-cert.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ssl-cert.eclass 20 Mar 2014 19:32:09 - 1.23
+++ ssl-cert.eclass 20 Mar 2014 19:33:13 - 1.24
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.23 2014/03/20
19:32:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.24 2014/03/20
19:33:13 vapier Exp $
# @ECLASS: ssl-cert.eclass
# @MAINTAINER:
@@ -104,7 +104,7 @@
#
# Access: private
gen_key() {
- local base=`get_base $1`
+ local base=$(get_base "$1")
ebegin "Generating ${SSL_BITS} bit RSA key${1:+ for CA}"
openssl genrsa -rand "${SSL_RANDOM}" \
-out "${base}.key" "${SSL_BITS}" &> /dev/null
@@ -121,7 +121,7 @@
#
# Access: private
gen_csr() {
- local base=`get_base $1`
+ local base=$(get_base "$1")
ebegin "Generating Certificate Signing Request${1:+ for CA}"
openssl req -config "${SSL_CONF}" -new \
-key "${base}.key" -out "${base}.csr" &>/dev/null
@@ -140,14 +140,14 @@
#
# Access: private
gen_crt() {
- local base=`get_base $1`
+ local base=$(get_base "$1")
if [ "${1}" ] ; then
ebegin "Generating self-signed X.509 Certificate for CA"
openssl x509 -extfile "${SSL_CONF}" \
-days ${SSL_DAYS} -req -signkey "${base}.key" \
-in "${base}.csr" -out "${base}.crt" &>/dev/null
else
- local ca=`get_base 1`
+ local ca=$(get_base 1)
ebegin "Generating authority-signed X.509 Certificate"
openssl x509 -extfile "${SSL_CONF}" \
-days ${SSL_DAYS} -req -CAserial "${SSL_SERIAL}" \
@@ -167,7 +167,7 @@
#
# Access: private
gen_pem() {
- local base=`get_base $1`
+ local base=$(get_base "$1")
ebegin "Generating PEM Certificate"
(cat "${base}.key"; echo; cat "${base}.crt") > "${base}.pem"
eend $?
[gentoo-commits] gentoo-x86 commit in eclass: ssl-cert.eclass
vapier 14/03/20 19:30:33
Modified: ssl-cert.eclass
Log:
misc style fixes -- do not hardcode full path to `openssl`
Revision ChangesPath
1.21 eclass/ssl-cert.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.21&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.21&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?r1=1.20&r2=1.21
Index: ssl-cert.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ssl-cert.eclass 3 Jan 2013 19:19:55 - 1.20
+++ ssl-cert.eclass 20 Mar 2014 19:30:32 - 1.21
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.20 2013/01/03
19:19:55 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.21 2014/03/20
19:30:32 vapier Exp $
# @ECLASS: ssl-cert.eclass
# @MAINTAINER:
@@ -16,16 +16,14 @@
# @ECLASS-VARIABLE: SSL_CERT_MANDATORY
# @DESCRIPTION:
# Set to non zero if ssl-cert is mandatory for ebuild.
-#
-SSL_CERT_MANDATORY="${SSL_CERT_MANDATORY:-0}"
+: ${SSL_CERT_MANDATORY:=0}
# @ECLASS-VARIABLE: SSL_CERT_USE
# @DESCRIPTION:
# Use flag to append dependency to.
-#
-SSL_CERT_USE="${SSL_CERT_USE:-ssl}"
+: ${SSL_CERT_USE:=ssl}
-if [[ "${SSL_CERT_MANDATORY}" = 0 ]]; then
+if [[ "${SSL_CERT_MANDATORY}" == "0" ]]; then
DEPEND="${SSL_CERT_USE}? ( dev-libs/openssl )"
IUSE="${SSL_CERT_USE}"
else
@@ -108,7 +106,7 @@
gen_key() {
local base=`get_base $1`
ebegin "Generating ${SSL_BITS} bit RSA key${1:+ for CA}"
- /usr/bin/openssl genrsa -rand "${SSL_RANDOM}" \
+ openssl genrsa -rand "${SSL_RANDOM}" \
-out "${base}.key" "${SSL_BITS}" &> /dev/null
eend $?
@@ -125,7 +123,7 @@
gen_csr() {
local base=`get_base $1`
ebegin "Generating Certificate Signing Request${1:+ for CA}"
- /usr/bin/openssl req -config "${SSL_CONF}" -new \
+ openssl req -config "${SSL_CONF}" -new \
-key "${base}.key" -out "${base}.csr" &>/dev/null
eend $?
@@ -145,13 +143,13 @@
local base=`get_base $1`
if [ "${1}" ] ; then
ebegin "Generating self-signed X.509 Certificate for CA"
- /usr/bin/openssl x509 -extfile "${SSL_CONF}" \
+ openssl x509 -extfile "${SSL_CONF}" \
-days ${SSL_DAYS} -req -signkey "${base}.key" \
-in "${base}.csr" -out "${base}.crt" &>/dev/null
else
local ca=`get_base 1`
ebegin "Generating authority-signed X.509 Certificate"
- /usr/bin/openssl x509 -extfile "${SSL_CONF}" \
+ openssl x509 -extfile "${SSL_CONF}" \
-days ${SSL_DAYS} -req -CAserial "${SSL_SERIAL}" \
-CAkey "${ca}.key" -CA "${ca}.crt" \
-in "${base}.csr" -out "${base}.crt" &>/dev/null
@@ -246,7 +244,7 @@
install -m0444 "${base}.csr" "${ROOT}${cert}.csr"
install -m0444 "${base}.crt" "${ROOT}${cert}.crt"
install -m0400 "${base}.pem" "${ROOT}${cert}.pem"
- count=$((${count}+1))
+ : $(( ++count ))
done
# Resulting status
[gentoo-commits] gentoo-x86 commit in eclass: ssl-cert.eclass
vapier 14/03/20 19:30:56
Modified: ssl-cert.eclass
Log:
drop long dead docert func
Revision ChangesPath
1.22 eclass/ssl-cert.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.22&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.22&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?r1=1.21&r2=1.22
Index: ssl-cert.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ssl-cert.eclass 20 Mar 2014 19:30:32 - 1.21
+++ ssl-cert.eclass 20 Mar 2014 19:30:56 - 1.22
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.21 2014/03/20
19:30:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.22 2014/03/20
19:30:56 vapier Exp $
# @ECLASS: ssl-cert.eclass
# @MAINTAINER:
@@ -175,13 +175,6 @@
return $?
}
-# Removed due to bug 174759
-docert() {
- eerror "Function \"docert\" has been removed for security reasons."
- eerror "\"install_cert\" should be used instead. See bug 174759."
- die
-}
-
# @FUNCTION: install_cert
# @USAGE:
# @DESCRIPTION:
[gentoo-commits] gentoo-x86 commit in eclass: ssl-cert.eclass
vapier 14/03/20 19:32:09
Modified: ssl-cert.eclass
Log:
update banned list of src funcs install_cert is banned in, and upgrade the
call to a `die`
Revision ChangesPath
1.23 eclass/ssl-cert.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.23&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.23&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?r1=1.22&r2=1.23
Index: ssl-cert.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ssl-cert.eclass 20 Mar 2014 19:30:56 - 1.22
+++ ssl-cert.eclass 20 Mar 2014 19:32:09 - 1.23
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.22 2014/03/20
19:30:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.23 2014/03/20
19:32:09 vapier Exp $
# @ECLASS: ssl-cert.eclass
# @MAINTAINER:
@@ -192,9 +192,9 @@
fi
case ${EBUILD_PHASE} in
- unpack|compile|test|install)
- eerror "install_cert cannot be called in
${EBUILD_PHASE}"
- return 1 ;;
+ unpack|prepare|configure|compile|test|install)
+ die "install_cert cannot be called in ${EBUILD_PHASE}"
+ ;;
esac
# Generate a CA environment #164601
[gentoo-commits] gentoo-x86 commit in eclass: ssl-cert.eclass
vapier 14/03/20 19:33:13
Modified: ssl-cert.eclass
Log:
style fix: change `...` to $(...)
Revision ChangesPath
1.24 eclass/ssl-cert.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.24&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.24&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?r1=1.23&r2=1.24
Index: ssl-cert.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ssl-cert.eclass 20 Mar 2014 19:32:09 - 1.23
+++ ssl-cert.eclass 20 Mar 2014 19:33:13 - 1.24
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.23 2014/03/20
19:32:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.24 2014/03/20
19:33:13 vapier Exp $
# @ECLASS: ssl-cert.eclass
# @MAINTAINER:
@@ -104,7 +104,7 @@
#
# Access: private
gen_key() {
- local base=`get_base $1`
+ local base=$(get_base "$1")
ebegin "Generating ${SSL_BITS} bit RSA key${1:+ for CA}"
openssl genrsa -rand "${SSL_RANDOM}" \
-out "${base}.key" "${SSL_BITS}" &> /dev/null
@@ -121,7 +121,7 @@
#
# Access: private
gen_csr() {
- local base=`get_base $1`
+ local base=$(get_base "$1")
ebegin "Generating Certificate Signing Request${1:+ for CA}"
openssl req -config "${SSL_CONF}" -new \
-key "${base}.key" -out "${base}.csr" &>/dev/null
@@ -140,14 +140,14 @@
#
# Access: private
gen_crt() {
- local base=`get_base $1`
+ local base=$(get_base "$1")
if [ "${1}" ] ; then
ebegin "Generating self-signed X.509 Certificate for CA"
openssl x509 -extfile "${SSL_CONF}" \
-days ${SSL_DAYS} -req -signkey "${base}.key" \
-in "${base}.csr" -out "${base}.crt" &>/dev/null
else
- local ca=`get_base 1`
+ local ca=$(get_base 1)
ebegin "Generating authority-signed X.509 Certificate"
openssl x509 -extfile "${SSL_CONF}" \
-days ${SSL_DAYS} -req -CAserial "${SSL_SERIAL}" \
@@ -167,7 +167,7 @@
#
# Access: private
gen_pem() {
- local base=`get_base $1`
+ local base=$(get_base "$1")
ebegin "Generating PEM Certificate"
(cat "${base}.key"; echo; cat "${base}.crt") > "${base}.pem"
eend $?
[gentoo-commits] gentoo-x86 commit in eclass: ssl-cert.eclass
vapier 14/03/20 19:30:33
Modified: ssl-cert.eclass
Log:
misc style fixes -- do not hardcode full path to `openssl`
Revision ChangesPath
1.21 eclass/ssl-cert.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.21&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.21&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?r1=1.20&r2=1.21
Index: ssl-cert.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ssl-cert.eclass 3 Jan 2013 19:19:55 - 1.20
+++ ssl-cert.eclass 20 Mar 2014 19:30:32 - 1.21
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.20 2013/01/03
19:19:55 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.21 2014/03/20
19:30:32 vapier Exp $
# @ECLASS: ssl-cert.eclass
# @MAINTAINER:
@@ -16,16 +16,14 @@
# @ECLASS-VARIABLE: SSL_CERT_MANDATORY
# @DESCRIPTION:
# Set to non zero if ssl-cert is mandatory for ebuild.
-#
-SSL_CERT_MANDATORY="${SSL_CERT_MANDATORY:-0}"
+: ${SSL_CERT_MANDATORY:=0}
# @ECLASS-VARIABLE: SSL_CERT_USE
# @DESCRIPTION:
# Use flag to append dependency to.
-#
-SSL_CERT_USE="${SSL_CERT_USE:-ssl}"
+: ${SSL_CERT_USE:=ssl}
-if [[ "${SSL_CERT_MANDATORY}" = 0 ]]; then
+if [[ "${SSL_CERT_MANDATORY}" == "0" ]]; then
DEPEND="${SSL_CERT_USE}? ( dev-libs/openssl )"
IUSE="${SSL_CERT_USE}"
else
@@ -108,7 +106,7 @@
gen_key() {
local base=`get_base $1`
ebegin "Generating ${SSL_BITS} bit RSA key${1:+ for CA}"
- /usr/bin/openssl genrsa -rand "${SSL_RANDOM}" \
+ openssl genrsa -rand "${SSL_RANDOM}" \
-out "${base}.key" "${SSL_BITS}" &> /dev/null
eend $?
@@ -125,7 +123,7 @@
gen_csr() {
local base=`get_base $1`
ebegin "Generating Certificate Signing Request${1:+ for CA}"
- /usr/bin/openssl req -config "${SSL_CONF}" -new \
+ openssl req -config "${SSL_CONF}" -new \
-key "${base}.key" -out "${base}.csr" &>/dev/null
eend $?
@@ -145,13 +143,13 @@
local base=`get_base $1`
if [ "${1}" ] ; then
ebegin "Generating self-signed X.509 Certificate for CA"
- /usr/bin/openssl x509 -extfile "${SSL_CONF}" \
+ openssl x509 -extfile "${SSL_CONF}" \
-days ${SSL_DAYS} -req -signkey "${base}.key" \
-in "${base}.csr" -out "${base}.crt" &>/dev/null
else
local ca=`get_base 1`
ebegin "Generating authority-signed X.509 Certificate"
- /usr/bin/openssl x509 -extfile "${SSL_CONF}" \
+ openssl x509 -extfile "${SSL_CONF}" \
-days ${SSL_DAYS} -req -CAserial "${SSL_SERIAL}" \
-CAkey "${ca}.key" -CA "${ca}.crt" \
-in "${base}.csr" -out "${base}.crt" &>/dev/null
@@ -246,7 +244,7 @@
install -m0444 "${base}.csr" "${ROOT}${cert}.csr"
install -m0444 "${base}.crt" "${ROOT}${cert}.crt"
install -m0400 "${base}.pem" "${ROOT}${cert}.pem"
- count=$((${count}+1))
+ : $(( ++count ))
done
# Resulting status
[gentoo-commits] gentoo-x86 commit in eclass: ssl-cert.eclass
vapier 14/03/20 19:30:56
Modified: ssl-cert.eclass
Log:
drop long dead docert func
Revision ChangesPath
1.22 eclass/ssl-cert.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.22&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.22&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?r1=1.21&r2=1.22
Index: ssl-cert.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ssl-cert.eclass 20 Mar 2014 19:30:32 - 1.21
+++ ssl-cert.eclass 20 Mar 2014 19:30:56 - 1.22
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.21 2014/03/20
19:30:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.22 2014/03/20
19:30:56 vapier Exp $
# @ECLASS: ssl-cert.eclass
# @MAINTAINER:
@@ -175,13 +175,6 @@
return $?
}
-# Removed due to bug 174759
-docert() {
- eerror "Function \"docert\" has been removed for security reasons."
- eerror "\"install_cert\" should be used instead. See bug 174759."
- die
-}
-
# @FUNCTION: install_cert
# @USAGE:
# @DESCRIPTION:
[gentoo-commits] gentoo-x86 commit in eclass: ssl-cert.eclass
vapier 14/03/20 19:32:09
Modified: ssl-cert.eclass
Log:
update banned list of src funcs install_cert is banned in, and upgrade the
call to a `die`
Revision ChangesPath
1.23 eclass/ssl-cert.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.23&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.23&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?r1=1.22&r2=1.23
Index: ssl-cert.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ssl-cert.eclass 20 Mar 2014 19:30:56 - 1.22
+++ ssl-cert.eclass 20 Mar 2014 19:32:09 - 1.23
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.22 2014/03/20
19:30:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.23 2014/03/20
19:32:09 vapier Exp $
# @ECLASS: ssl-cert.eclass
# @MAINTAINER:
@@ -192,9 +192,9 @@
fi
case ${EBUILD_PHASE} in
- unpack|compile|test|install)
- eerror "install_cert cannot be called in
${EBUILD_PHASE}"
- return 1 ;;
+ unpack|prepare|configure|compile|test|install)
+ die "install_cert cannot be called in ${EBUILD_PHASE}"
+ ;;
esac
# Generate a CA environment #164601
[gentoo-commits] gentoo-x86 commit in eclass: ssl-cert.eclass
vapier 14/03/20 19:33:13
Modified: ssl-cert.eclass
Log:
style fix: change `...` to $(...)
Revision ChangesPath
1.24 eclass/ssl-cert.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.24&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.24&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?r1=1.23&r2=1.24
Index: ssl-cert.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ssl-cert.eclass 20 Mar 2014 19:32:09 - 1.23
+++ ssl-cert.eclass 20 Mar 2014 19:33:13 - 1.24
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.23 2014/03/20
19:32:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.24 2014/03/20
19:33:13 vapier Exp $
# @ECLASS: ssl-cert.eclass
# @MAINTAINER:
@@ -104,7 +104,7 @@
#
# Access: private
gen_key() {
- local base=`get_base $1`
+ local base=$(get_base "$1")
ebegin "Generating ${SSL_BITS} bit RSA key${1:+ for CA}"
openssl genrsa -rand "${SSL_RANDOM}" \
-out "${base}.key" "${SSL_BITS}" &> /dev/null
@@ -121,7 +121,7 @@
#
# Access: private
gen_csr() {
- local base=`get_base $1`
+ local base=$(get_base "$1")
ebegin "Generating Certificate Signing Request${1:+ for CA}"
openssl req -config "${SSL_CONF}" -new \
-key "${base}.key" -out "${base}.csr" &>/dev/null
@@ -140,14 +140,14 @@
#
# Access: private
gen_crt() {
- local base=`get_base $1`
+ local base=$(get_base "$1")
if [ "${1}" ] ; then
ebegin "Generating self-signed X.509 Certificate for CA"
openssl x509 -extfile "${SSL_CONF}" \
-days ${SSL_DAYS} -req -signkey "${base}.key" \
-in "${base}.csr" -out "${base}.crt" &>/dev/null
else
- local ca=`get_base 1`
+ local ca=$(get_base 1)
ebegin "Generating authority-signed X.509 Certificate"
openssl x509 -extfile "${SSL_CONF}" \
-days ${SSL_DAYS} -req -CAserial "${SSL_SERIAL}" \
@@ -167,7 +167,7 @@
#
# Access: private
gen_pem() {
- local base=`get_base $1`
+ local base=$(get_base "$1")
ebegin "Generating PEM Certificate"
(cat "${base}.key"; echo; cat "${base}.crt") > "${base}.pem"
eend $?
