diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4213bcd --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/opendnssec-1.4.7.tar.gz diff --git a/.opendnssec.metadata b/.opendnssec.metadata new file mode 100644 index 0000000..4bcb647 --- /dev/null +++ b/.opendnssec.metadata @@ -0,0 +1 @@ +c8a5808d68a50db8ed7edf806a58f54428ad7aa8 SOURCES/opendnssec-1.4.7.tar.gz diff --git a/SOURCES/0001-use-system-trang.patch b/SOURCES/0001-use-system-trang.patch new file mode 100644 index 0000000..127c16f --- /dev/null +++ b/SOURCES/0001-use-system-trang.patch @@ -0,0 +1,24 @@ +diff -r -u3 opendnssec-1.4.6/conf/Makefile.am opendnssec-1.4.6.trang/conf/Makefile.am +--- opendnssec-1.4.6/conf/Makefile.am 2014-07-21 11:30:06.000000000 +0200 ++++ opendnssec-1.4.6.trang/conf/Makefile.am 2014-09-22 22:48:32.000000000 +0200 +@@ -29,7 +29,7 @@ + .rnc.rng: + @test -x "${JAVA}" || \ + (echo "java is required for converting RelaxNG Compact to RelaxNG"; false) +- ${JAVA} -jar ${TRANG} $< $@ ++ trang $< $@ + + regress: $(RNG) + @test -x "${XMLLINT}" || \ +diff -r -u3 opendnssec-1.4.6/conf/Makefile.in opendnssec-1.4.6.trang/conf/Makefile.in +--- opendnssec-1.4.6/conf/Makefile.in 2014-07-21 11:32:01.000000000 +0200 ++++ opendnssec-1.4.6.trang/conf/Makefile.in 2014-09-22 22:48:55.000000000 +0200 +@@ -551,7 +617,7 @@ + .rnc.rng: + @test -x "${JAVA}" || \ + (echo "java is required for converting RelaxNG Compact to RelaxNG"; false) +- ${JAVA} -jar ${TRANG} $< $@ ++ trang $< $@ + + regress: $(RNG) + @test -x "${XMLLINT}" || \ diff --git a/SOURCES/0002-get-started.patch b/SOURCES/0002-get-started.patch new file mode 100644 index 0000000..caed0f1 --- /dev/null +++ b/SOURCES/0002-get-started.patch @@ -0,0 +1,26 @@ +diff -rNu3 opendnssec-1.4.6/GETSTARTED opendnssec-1.4.6.new/GETSTARTED +--- opendnssec-1.4.6/GETSTARTED 1970-01-01 01:00:00.000000000 +0100 ++++ opendnssec-1.4.6.new/GETSTARTED 2014-09-23 08:20:07.000000000 +0200 +@@ -0,0 +1,22 @@ ++For detailed instructions please see ++https://wiki.opendnssec.org/display/DOCS/Getting+Started ++ ++Quick start: ++1. Get HSM module with PKCS#11 interface. You can use SoftHSM package. ++ ++2. Configure SoftHSM v2: ++2.1. Check /etc/softhsm2.conf and optionally change paths if necessary ++2.2. Make up your own PIN and SO PIN! ++2.3. Initialize SoftHSM token: ++$ softhsm2-util --init-token --slot 0 --label "OpenDNSSEC" \ ++ --pin 5678 --so-pin 9012 ++2.4. Allow OpenDNSSEC user to access SoftHSM data: ++ $ chown -R ods: ++ ++3. Configure OpenDNSSEC: ++3.1. Write token PIN to /etc/opendnssec/conf.xml ++3.2. Review and modify Key and Signing Policy in /etc/opendnssec/kasp.xml ++3.3. Initialize OpenDNSSEC database: ++ $ ods-ksmutil setup ++ ++4. Use OpenDNSSEC - see man ods-ksmutil diff --git a/SOURCES/conf.xml b/SOURCES/conf.xml new file mode 100644 index 0000000..2a3a92e --- /dev/null +++ b/SOURCES/conf.xml @@ -0,0 +1,84 @@ + + + + + + + + /usr/lib64/pkcs11/libsofthsm2.so + OpenDNSSEC + 1234 + + + + + + + + + + local0 + + + /etc/opendnssec/kasp.xml + /etc/opendnssec/zonelist.xml + + + + + + + ods + ods + + + /var/opendnssec/kasp.db + PT3600S + + + + + + + + + + ods + ods + + + /var/opendnssec/tmp + 4 + + + + + + + diff --git a/SOURCES/ods-enforcerd.service b/SOURCES/ods-enforcerd.service new file mode 100644 index 0000000..b660d86 --- /dev/null +++ b/SOURCES/ods-enforcerd.service @@ -0,0 +1,12 @@ +[Unit] +Description=OpenDNSSEC Enforcer daemon +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/var/run/opendnssec/enforcerd.pid +EnvironmentFile=-/etc/sysconfig/ods +ExecStart=/usr/sbin/ods-enforcerd $ODS_ENFORCERD_OPT + +[Install] +WantedBy=multi-user.target diff --git a/SOURCES/ods-signerd.service b/SOURCES/ods-signerd.service new file mode 100644 index 0000000..a7b7034 --- /dev/null +++ b/SOURCES/ods-signerd.service @@ -0,0 +1,12 @@ +[Unit] +Description=OpenDNSSEC signer daemon +After=syslog.target network.target ods-enforcerd + +[Service] +Type=simple +PIDFile=/var/run/opendnssec/signerd.pid +EnvironmentFile=-/etc/sysconfig/ods +ExecStart=/usr/sbin/ods-signerd -d $ODS_SIGNERD_OPT + +[Install] +WantedBy=multi-user.target diff --git a/SOURCES/ods.sysconfig b/SOURCES/ods.sysconfig new file mode 100644 index 0000000..1cf67f2 --- /dev/null +++ b/SOURCES/ods.sysconfig @@ -0,0 +1,2 @@ +ODS_SIGNERD_OPT="" +ODS_ENFORCERD_OPT="" diff --git a/SOURCES/opendnssec-1.4.7-1204100-extract.patch b/SOURCES/opendnssec-1.4.7-1204100-extract.patch new file mode 100644 index 0000000..dddc030 --- /dev/null +++ b/SOURCES/opendnssec-1.4.7-1204100-extract.patch @@ -0,0 +1,156 @@ +diff -Naur opendnssec-1.4.7-orig/conf/conf.rnc opendnssec-1.4.7/conf/conf.rnc +--- opendnssec-1.4.7-orig/conf/conf.rnc 2014-12-04 10:17:40.000000000 -0500 ++++ opendnssec-1.4.7/conf/conf.rnc 2014-12-08 22:49:16.100212010 -0500 +@@ -50,7 +50,10 @@ + element RequireBackup { empty }?, + + # Do not maintain public keys in the repository (optional) +- element SkipPublicKey { empty }? ++ element SkipPublicKey { empty }?, ++ ++ # Generate extractable keys (CKA_EXTRACTABLE = TRUE) (optional) ++ element AllowExtraction { empty }? + }* + }, + +diff -Naur opendnssec-1.4.7-orig/conf/conf.rng opendnssec-1.4.7/conf/conf.rng +--- opendnssec-1.4.7-orig/conf/conf.rng 2014-12-04 10:18:39.000000000 -0500 ++++ opendnssec-1.4.7/conf/conf.rng 2014-12-08 22:49:16.105212137 -0500 +@@ -71,6 +71,12 @@ + + + ++ ++ ++ ++ ++ ++ + + + +diff -Naur opendnssec-1.4.7-orig/conf/conf.xml.in opendnssec-1.4.7/conf/conf.xml.in +--- opendnssec-1.4.7-orig/conf/conf.xml.in 2014-12-04 10:17:40.000000000 -0500 ++++ opendnssec-1.4.7/conf/conf.xml.in 2014-12-08 22:49:16.101212036 -0500 +@@ -9,6 +9,9 @@ + OpenDNSSEC + 1234 + ++ + + +