emo/make-ca
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always add REVISION value to installed certdata.txt

Browse Source
This commit is contained in:
DJ Lucas 2017-09-21 00:34:41 -05:00
parent e252b2413f
commit bf6d2a8eed
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -1,6 +1,7 @@
0.2 - Install source certdata.txt file 0.2 - Install source certdata.txt file
- Provide -r/--rebuild option - Provide -r/--rebuild option
- Add -g/--get option to download using only s_client - Add -g/--get option to download using only s_client
- Always add REVISION value to installed certdata.txt
0.1 - Check executable bit for CERTUTIL, KEYTOOL, and OPENSSL 0.1 - Check executable bit for CERTUTIL, KEYTOOL, and OPENSSL
- Allow global configuration file - Allow global configuration file
- Use correct license text (MIT) - Use correct license text (MIT)

9
make-ca
View File

@ -144,7 +144,7 @@ function get_args(){
;; ;;
-g | --get) -g | --get)
if test "${REBUILD}" == "0" -a "${CERTDATAY}" == "0"; then if test "${REBUILD}" == "0" -a "${CERTDATAY}" == "0"; then
GET=1 GET="1"
CERTDATA="${TEMPDIR}/certdatanew.txt" CERTDATA="${TEMPDIR}/certdatanew.txt"
shift 1 shift 1
else else
@ -186,6 +186,7 @@ function get_args(){
-r | --rebuild) -r | --rebuild)
if test "${CERTDATAY}" == "0" -a "${GET}" == "0"; then if test "${CERTDATAY}" == "0" -a "${GET}" == "0"; then
REBUILD="1" REBUILD="1"
FORCE="1"
shift 1 shift 1
else else
echo "Error: ${1} cannot be used with the -C/--certdata or -g/--get switches." echo "Error: ${1} cannot be used with the -C/--certdata or -g/--get switches."
@ -422,6 +423,8 @@ if test "${VERSION}x" == "x"; then
echo "Will run conversion unconditionally." echo "Will run conversion unconditionally."
sleep 2 sleep 2
VERSION="$(date -u +%Y%m%d-%H%M)" VERSION="$(date -u +%Y%m%d-%H%M)"
echo "#CVS_ID @# \$ RCSfile: certdata.txt \$ \$Revision: ${VERSION} \$ \$Date: \$" > "${WORKDIR}/certdata.txt"
else else
if test "${FORCE}" == "1"; then if test "${FORCE}" == "1"; then
echo "Output forced. Will run conversion unconditionally." echo "Output forced. Will run conversion unconditionally."
@ -437,7 +440,7 @@ if test "${OLDVERSION}x" == "${VERSION}x"; then
exit 0 exit 0
fi fi
cp "${CERTDATA}" "${WORKDIR}/certdata.txt" cat "${CERTDATA}" >> "${WORKDIR}/certdata.txt"
pushd "${WORKDIR}" > /dev/null pushd "${WORKDIR}" > /dev/null
if test "${WITH_NSS}" == "1"; then if test "${WITH_NSS}" == "1"; then
@ -785,7 +788,7 @@ popd > /dev/null
# Install certdata.txt # Install certdata.txt
if test "${REBUILD}" == "0"; then if test "${REBUILD}" == "0"; then
install -m644 "${CERTDATA}" "${DESTDIR}${SSLDIR}/certdata.txt" install -m644 "${WORKDIR}/certdata.txt" "${DESTDIR}${SSLDIR}/certdata.txt"
fi fi
# Clean up the mess # Clean up the mess