diff --git a/.gitignore b/.cvsignore similarity index 100% rename from .gitignore rename to .cvsignore diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..bc79736 --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: websec +# $Id$ +NAME := websec +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/websec-disable-htmldocs b/websec-disable-htmldocs deleted file mode 100644 index f622f56..0000000 --- a/websec-disable-htmldocs +++ /dev/null @@ -1,23 +0,0 @@ -# -# newer GNU Make versions (3.82, maybe older) get confused by something in this -# area; we never installed the HTML docs anyway, so simply remove the section -# -diff -Naru websec-1.9.0.org/Makefile websec-1.9.0/Makefile ---- websec-1.9.0.org/Makefile 2003-05-18 09:37:00.000000000 +0200 -+++ websec-1.9.0/Makefile 2011-06-22 18:54:11.674124020 +0200 -@@ -55,15 +55,3 @@ - - $(CONFMAN) : %.5 : % - pod2man --section 5 $< > $@ -- --install_html: html -- install -m 0644 $(HTMLFILES) $(DEST) -- --html: $(CONFMANHTML) $(PROGMANHTML) -- --$(CONFMANHTML) : %(5).html : % -- pod2html --htmlroot . --podroot . --podpath . --infile "$<" --outfile "$@" -- --$(PROGMANHTML) : %(1).html : % -- -rm -f pod2htm* -- pod2html --htmlroot . --podroot . --podpath . --infile "$<" --outfile "$@" diff --git a/websec-silence-unescaped-left-brace-warnings.patch b/websec-silence-unescaped-left-brace-warnings.patch deleted file mode 100644 index b7d63d0..0000000 --- a/websec-silence-unescaped-left-brace-warnings.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Naur websec-1.9.0.org/websec websec-1.9.0/websec ---- websec-1.9.0.org/websec 2006-01-20 19:05:25.000000000 +0100 -+++ websec-1.9.0/websec 2015-11-22 14:46:52.891549814 +0100 -@@ -229,12 +229,12 @@ - } - - # Allow values from the environment -- while ($value =~ m/\${([^}]+)}/) { -+ while ($value =~ m/\$\{([^}]+)}/) { - if (not exists $ENV{$1}) { - print STDERR "Used environment variable '$1' but it is not defined, aborting.\n"; - exit 1; - } -- $value =~ s/\${([^}]+)}/$ENV{$1}/; -+ $value =~ s/\$\{([^}]+)}/$ENV{$1}/; - } - - $siteinfo{$keyword} = $value; diff --git a/websec.spec b/websec.spec index 5fe97e3..4a4d355 100644 --- a/websec.spec +++ b/websec.spec @@ -1,29 +1,18 @@ Name: websec Version: 1.9.0 -Release: 42%{?dist} +Release: 7.1 Summary: Web Secretary - Web page monitoring software with highlighting -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later -URL: https://github.com/baruch/websec -Source0: websec-1.9.0.tar.gz -# Patch0: newer GNU Make versions (3.82, maybe older as well) get confused by -# parts of the Makefile that are unused anyway, so remove them with this patch; -# upstream is dead afaics -Patch0: %{name}-disable-htmldocs -# Patch1: Background in https://bugzilla.redhat.com/show_bug.cgi?id=1254288 -# not send upstream, as its dead -Patch1: %{name}-silence-unescaped-left-brace-warnings.patch +Group: Applications/Internet +License: GPLv2+ +URL: http://baruch.ev-en.org/proj/websec/ +Source0: http://baruch.ev-en.org/proj/websec/websec-1.9.0.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: make -BuildRequires: /usr/bin/pod2man -BuildRequires: perl-generators -# needed to send mail: Requires: /usr/sbin/sendmail -# needed for ssl: +# perl-IO-Socket-SSL needed for https: Requires: perl(IO::Socket::SSL) -Requires: perl(LWP::Protocol::https) %description Web Secretary is a web page change monitoring software. It will detect changes @@ -35,8 +24,6 @@ load the highlighted page in a browser. %prep %setup -q -%patch -P0 -p1 -b .patch0 -%patch -P1 -p1 -b .patch1 %build @@ -63,122 +50,18 @@ cp rollback htmldiff .__doc/scripts/ chmod -x .__doc/scripts/* +%clean +rm -rf $RPM_BUILD_ROOT + %files +%defattr(-,root,root,-) %doc COPYING HACKING NEWS TODO .__doc/* %{_bindir}/* %{_datadir}/man/man*/* %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 1.9.0-42 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 1.9.0-41 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 1.9.0-40 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 1.9.0-39 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 26 2024 Miroslav Suchý - 1.9.0-38 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 1.9.0-37 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 1.9.0-36 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 1.9.0-35 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 1.9.0-34 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.9.0-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 1.9.0-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.9.0-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 1.9.0-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.9.0-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Mar 30 2020 Thorsten Leemhuis - 1.9.0-28 -- Update project URL -- require perl(LWP::Protocol::https) (needed for https) - -* Fri Jan 31 2020 Fedora Release Engineering - 1.9.0-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 1.9.0-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 1.9.0-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 1.9.0-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 1.9.0-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.9.0-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.9.0-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 1.9.0-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sun Nov 22 2015 Thorsten Leemhuis - 1.9.0-19 -- add patch to silence warnings "Unescaped left brace in regex is deprecated, - passed through in regex" in perl 5.22 (#1254288) - -* Wed Jul 01 2015 Ralf Corsépius - 0.9.1-18 -- Add dist-tag (RHBZ #1237192). - -* Fri Jun 19 2015 Fedora Release Engineering - 1.9.0-17.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 1.9.0-16.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 1.9.0-15.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Jul 17 2013 Petr Pisar - 1.9.0-14.1 -- Perl 5.18 rebuild - -* Fri Mar 01 2013 Thorsten Leemhuis - 1.9.0-13.1 -- add /usr/bin/pod2man as BR (needed for F19 #914569) - -* Fri Feb 15 2013 Fedora Release Engineering - 1.9.0-12.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 1.9.0-11.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 1.9.0-10.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Jun 22 2011 Thorsten Leemhuis - 1.9.0-9.1 -- Add a patch that removes some usused HTML procssing bit from the Makefile - that seem to confuse newer make versions; fixes #660818 (FTBS) - -* Mon Feb 07 2011 Fedora Release Engineering - 1.9.0-8.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - * Mon Jul 27 2009 Fedora Release Engineering - 1.9.0-7.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild