From 60a61c9b406daa80bf7c272ec975334a90713547 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:15:30 +0000 Subject: [PATCH 1/6] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f3d1379..3a5a4dd 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: shmpps -# $Id$ +# $Id: Makefile,v 1.1 2009/08/20 17:39:34 tibbs Exp $ NAME := shmpps SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From e26ae712efe0708f9a1a40651242beae9d2bc2af Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 12:44:26 +0000 Subject: [PATCH 2/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 3a5a4dd..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: shmpps -# $Id: Makefile,v 1.1 2009/08/20 17:39:34 tibbs Exp $ -NAME := shmpps -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index d6edba4..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -shmpps-1_03-1_fc11:HEAD:shmpps-1.03-1.fc11.src.rpm:1250790529 From d1b5bc95d136681d7149358cefc5b1e5b0ae00b5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 9 Feb 2011 07:37:09 -0600 Subject: [PATCH 3/6] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- shmpps.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shmpps.spec b/shmpps.spec index 89198d2..4e8cca8 100644 --- a/shmpps.spec +++ b/shmpps.spec @@ -1,6 +1,6 @@ Name: shmpps Version: 1.03 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Shared Memory driver for PPS time signals Group: System Environment/Daemons @@ -63,6 +63,9 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/shmpps %changelog +* Wed Feb 09 2011 Fedora Release Engineering - 1.03-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sat Nov 22 2008 Chris Adams 1.03-1 - initial package From 65d009377a0823c92e41a4720778df2abb08ec04 Mon Sep 17 00:00:00 2001 From: "Tom \"spot\" Callaway" Date: Thu, 15 Sep 2011 14:53:50 -0400 Subject: [PATCH 4/6] convert to systemd --- shmpps.service | 13 +++++++++++++ shmpps.spec | 53 ++++++++++++++++++++++++++++++++------------------ 2 files changed, 47 insertions(+), 19 deletions(-) create mode 100644 shmpps.service diff --git a/shmpps.service b/shmpps.service new file mode 100644 index 0000000..c97175a --- /dev/null +++ b/shmpps.service @@ -0,0 +1,13 @@ +[Unit] +Description=PPS Shared Memory Driver For NTP +After=syslog.target +Before=ntpd.service + +[Service] +Type=forking +EnvironmentFile=-/etc/sysconfig/shmpps +ExecStart=/usr/sbin/shm_splc2 $OPTIONS + +[Install] +WantedBy=multi-user.target + diff --git a/shmpps.spec b/shmpps.spec index 4e8cca8..cd245ee 100644 --- a/shmpps.spec +++ b/shmpps.spec @@ -1,20 +1,21 @@ Name: shmpps Version: 1.03 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Shared Memory driver for PPS time signals Group: System Environment/Daemons License: Public Domain and MIT URL: http://time.qnan.org/ Source0: http://time.qnan.org/%{name}.tar -Source1: shmpps.init +Source1: shmpps.service Source2: shmpps.sysconfig -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ntp -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig /sbin/service -Requires(postun): /sbin/service +BuildRequires: systemd-units +Requires(post): systemd-sysv +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units %description Shared memory (SHM) driver to allow high-resolution pulse-per-second @@ -34,35 +35,49 @@ sed -i \ make CFLAGS="%{optflags}" LDFLAGS="" %install -rm -rf %{buildroot} install -p -m755 -D shm_splc2 %{buildroot}%{_sbindir}/shm_splc2 -install -p -m755 -D %{SOURCE1} %{buildroot}%{_initrddir}/shmpps +install -p -m644 -D %{SOURCE1} %{buildroot}%{_unitdir}/shmpps.service install -p -m644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/shmpps -%clean -rm -rf %{buildroot} - %post -/sbin/chkconfig --add shmpps +if [ $1 -eq 1 ] ; then + # Initial installation + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +fi %preun -if [ "$1" -eq 0 ]; then - /sbin/service shmpps stop > /dev/null 2>&1 - /sbin/chkconfig --del shmpps +if [ $1 -eq 0 ] ; then + # Package removal, not upgrade + /bin/systemctl --no-reload disable shmpps.service > /dev/null 2>&1 || : + /bin/systemctl stop shmpps.service > /dev/null 2>&1 || : fi %postun -if [ "$1" -ge 1 ]; then - /sbin/service shmpps condrestart > /dev/null 2>&1 +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then + # Package upgrade, not uninstall + /bin/systemctl try-restart shmpps.service >/dev/null 2>&1 || : fi +%triggerun -- shmpps < 1.03-3 +# Save the current service runlevel info +# User must manually run systemd-sysv-convert --apply shmpps +# to migrate them to systemd targets +/usr/bin/systemd-sysv-convert --save shmpps >/dev/null 2>&1 ||: + +# Run these because the SysV package being removed won't do them +/sbin/chkconfig --del shmpps >/dev/null 2>&1 || : +/bin/systemctl try-restart shmpps.service >/dev/null 2>&1 || : + %files -%defattr(-,root,root,-) %{_sbindir}/shm_splc2 -%{_initrddir}/shmpps +%{_unitdir}/shmpps.service %config(noreplace) %{_sysconfdir}/sysconfig/shmpps %changelog +* Thu Sep 15 2011 Tom Callaway - 1.03-3 +- convert to systemd + * Wed Feb 09 2011 Fedora Release Engineering - 1.03-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 7448a6cc9c982cdf4533baabed08d83ea71efb80 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 21:54:24 -0600 Subject: [PATCH 5/6] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- shmpps.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shmpps.spec b/shmpps.spec index cd245ee..3584239 100644 --- a/shmpps.spec +++ b/shmpps.spec @@ -1,6 +1,6 @@ Name: shmpps Version: 1.03 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Shared Memory driver for PPS time signals Group: System Environment/Daemons @@ -75,6 +75,9 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/shmpps %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 1.03-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Thu Sep 15 2011 Tom Callaway - 1.03-3 - convert to systemd From 7bc990f52aad67adad491e622ec98c75e1fde191 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Wed, 4 Jun 2014 20:13:44 +0200 Subject: [PATCH 6/6] 2014-06-04 - This package was already retired in pkgdb/blocked in koji, but no dead.package file existed. The original retirement reason is unclear. --- .gitignore | 1 - dead.package | 1 + shmpps.init | 65 ----------------------------------- shmpps.service | 13 ------- shmpps.spec | 89 ------------------------------------------------ shmpps.sysconfig | 26 -------------- sources | 1 - 7 files changed, 1 insertion(+), 195 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 shmpps.init delete mode 100644 shmpps.service delete mode 100644 shmpps.spec delete mode 100644 shmpps.sysconfig delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 8e2bc77..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -shmpps.tar diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5784d07 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +2014-06-04 - This package was already retired in pkgdb/blocked in koji, but no dead.package file existed. The original retirement reason is unclear. diff --git a/shmpps.init b/shmpps.init deleted file mode 100644 index e3fac95..0000000 --- a/shmpps.init +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh -# -# shmpps This shell script takes care of starting and stopping -# the shared memory PPS driver. -# -# chkconfig: - 58 74 -# description: shm_splc2 is the shared memory PPS driver for NTP - -# Source function library -. /etc/init.d/functions - -prog=shm_splc2 -lockfile=/var/lock/subsys/$prog - -start() { - [ -x /usr/sbin/shm_splc2 ] || exit 5 - - [ -f /etc/sysconfig/shmpps ] || exit 6 - . /etc/sysconfig/shmpps - - echo -n $"Starting $prog: " - daemon $prog $OPTIONS - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch $lockfile - return $RETVAL -} - -stop() { - echo -n $"Shutting down $prog: " - killproc $prog - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f $lockfile - return $RETVAL -} - -# See how we were called -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status $prog - ;; - restart|force-reload) - stop - start - ;; - try-restart|condrestart) - if [ -f $lockfile ]; then - stop - start - fi - ;; - reload) - exit 3 - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}" - exit 2 -esac diff --git a/shmpps.service b/shmpps.service deleted file mode 100644 index c97175a..0000000 --- a/shmpps.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=PPS Shared Memory Driver For NTP -After=syslog.target -Before=ntpd.service - -[Service] -Type=forking -EnvironmentFile=-/etc/sysconfig/shmpps -ExecStart=/usr/sbin/shm_splc2 $OPTIONS - -[Install] -WantedBy=multi-user.target - diff --git a/shmpps.spec b/shmpps.spec deleted file mode 100644 index 3584239..0000000 --- a/shmpps.spec +++ /dev/null @@ -1,89 +0,0 @@ -Name: shmpps -Version: 1.03 -Release: 4%{?dist} -Summary: Shared Memory driver for PPS time signals - -Group: System Environment/Daemons -License: Public Domain and MIT -URL: http://time.qnan.org/ -Source0: http://time.qnan.org/%{name}.tar -Source1: shmpps.service -Source2: shmpps.sysconfig - -Requires: ntp -BuildRequires: systemd-units -Requires(post): systemd-sysv -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units - -%description -Shared memory (SHM) driver to allow high-resolution pulse-per-second -(PPS) time sources to be used with a Network Time Protocol (NTP) server -without a PPS-enabled kernel. The PPS pin of the time source must be -connected to the declared signal pin on a serial or parallel port. - -See /etc/sysconfig/shmpps for configuration. - -%prep -%setup -q -n %{name} -sed -i \ - -e 's/#undef *DOPARALLEL/#define DOPARALLEL/' \ - shm_splc2.c - -%build -make CFLAGS="%{optflags}" LDFLAGS="" - -%install -install -p -m755 -D shm_splc2 %{buildroot}%{_sbindir}/shm_splc2 -install -p -m644 -D %{SOURCE1} %{buildroot}%{_unitdir}/shmpps.service -install -p -m644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/shmpps - -%post -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi - -%preun -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable shmpps.service > /dev/null 2>&1 || : - /bin/systemctl stop shmpps.service > /dev/null 2>&1 || : -fi - -%postun -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart shmpps.service >/dev/null 2>&1 || : -fi - -%triggerun -- shmpps < 1.03-3 -# Save the current service runlevel info -# User must manually run systemd-sysv-convert --apply shmpps -# to migrate them to systemd targets -/usr/bin/systemd-sysv-convert --save shmpps >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del shmpps >/dev/null 2>&1 || : -/bin/systemctl try-restart shmpps.service >/dev/null 2>&1 || : - -%files -%{_sbindir}/shm_splc2 -%{_unitdir}/shmpps.service -%config(noreplace) %{_sysconfdir}/sysconfig/shmpps - -%changelog -* Sat Jan 14 2012 Fedora Release Engineering - 1.03-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Thu Sep 15 2011 Tom Callaway - 1.03-3 -- convert to systemd - -* Wed Feb 09 2011 Fedora Release Engineering - 1.03-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sat Nov 22 2008 Chris Adams 1.03-1 -- initial package - diff --git a/shmpps.sysconfig b/shmpps.sysconfig deleted file mode 100644 index f75f356..0000000 --- a/shmpps.sysconfig +++ /dev/null @@ -1,26 +0,0 @@ -######################################################################## -# Usage: -# shm -d/dev/device -s (serial) or -p (parallel) -u (unit) -# -c -l (line) -f -D -# -# -c sets second boundary on hi->lo transition for serial -# -l line defines serial line being sampled: DCD CTS DSR -# -f sets pin 14 flapping on parallel i/f -# -# -D debug level, may be repeated: -# No. of -D -# 0 normal operation: daemonize; no reporting -# 1 + no daemonization; progress reports to stderr -# 2 + out-of-range reports -# 3 + no updating SHM -# -# (wire PPS to parallel pin 10, ground to 18, echo out to 14) -# -# Configure ntpd to use this as a time source in ntp.conf like: -# server 127.127.28.3 minpoll 4 maxpoll 4 prefer -# fudge 127.127.28.3 refid GPS -######################################################################## -# For serial DCD -OPTIONS="-d /dev/gps0 -s -u 0 -l DCD" -# For parallel -#OPTIONS="-d /dev/parport0 -p -u 0 -l DCD" diff --git a/sources b/sources deleted file mode 100644 index f5d9614..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -a55d2a3c51c7810cfd3e2adb08f55d02 shmpps.tar