Compare commits

..

No commits in common. "rawhide" and "f15" have entirely different histories.

10 changed files with 112 additions and 286 deletions

View file

@ -1 +0,0 @@
1

2
.gitignore vendored
View file

@ -1 +1 @@
/urlview-08767a.tar.gz
urlview-0.9.tar.gz

1
ci.fmf
View file

@ -1 +0,0 @@
resultsdb-testcase: separate

View file

@ -1,26 +0,0 @@
--- !Policy
product_versions:
- fedora-*
decision_context: bodhi_update_push_testing
subject_type: koji_build
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
#Rawhide
--- !Policy
product_versions:
- fedora-*
decision_context: bodhi_update_push_stable
subject_type: koji_build
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
#gating rhel
--- !Policy
product_versions:
- rhel-*
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}

View file

@ -1,47 +0,0 @@
/tier1-internal:
plan:
import:
url: https://gitlab.com/redhat/centos-stream/tests/urlview.git
name: /plans/tier1/internal
adjust:
enabled: false
when: distro == centos-stream, fedora
because: They don't have access to internal repos.
/tier1-public:
plan:
import:
url: https://gitlab.com/redhat/centos-stream/tests/urlview.git
name: /plans/tier1/public
/tier2-tier3-internal:
plan:
import:
url: https://gitlab.com/redhat/centos-stream/tests/urlview.git
name: /plans/tier2-tier3/internal
adjust:
enabled: false
when: distro == centos-stream, fedora
because: They don't have access to internal repos.
/tier2-tier3-public:
plan:
import:
url: https://gitlab.com/redhat/centos-stream/tests/urlview.git
name: /plans/tier2-tier3/public
/others-internal:
plan:
import:
url: https://gitlab.com/redhat/centos-stream/tests/urlview.git
name: /plans/others/internal
adjust:
enabled: false
when: distro == centos-stream, fedora
because: They don't have access to internal repos.
/others-public:
plan:
import:
url: https://gitlab.com/redhat/centos-stream/tests/urlview.git
name: /plans/others/public

View file

@ -1 +1 @@
5a88be952d8e4c835396926da9b22c3d urlview-08767a.tar.gz
67731f73e69297ffd106b65c8aebb2ab urlview-0.9.tar.gz

60
urlview-0.9-build.diff Normal file
View file

@ -0,0 +1,60 @@
diff -u urlview-0.9.old/enter.c urlview-0.9/enter.c
--- urlview-0.9.old/enter.c Tue Jul 4 12:14:30 2000
+++ urlview-0.9/enter.c Tue Jul 4 14:48:40 2000
@@ -141,7 +141,9 @@
int pass = (flags == M_PASS);
int first = 1;
int j;
+#ifndef URLVIEW
char tempbuf[_POSIX_PATH_MAX] = "";
+#endif
FOREVER
{
diff -u urlview-0.9.old/urlview.c urlview-0.9/urlview.c
--- urlview-0.9.old/urlview.c Tue Jul 4 12:14:30 2000
+++ urlview-0.9/urlview.c Tue Jul 4 14:45:50 2000
@@ -46,6 +46,8 @@
#include <rx/rxposix.h>
#endif
+#define ISSPACE(c) isspace((unsigned char)c)
+
#define DEFAULT_REGEXP "(((https?|ftp|gopher)://|(mailto|file|news):)[^' \t<>\"]+|(www|web|w3)\\.[-a-z0-9.]+)[^' \t.,;<>\"\\):]"
#define DEFAULT_COMMAND "url_handler.sh %s"
#define SYSTEM_INITFILE "/etc/urlview.conf"
@@ -64,6 +66,8 @@
extern int mutt_enter_string (unsigned char *buf, size_t buflen, int y, int x,
int flags);
+extern char *quote (char *d, size_t l, const char *f);
+
void search_forward (char *search, int urlcount, char **url, int *redraw, int *current, int *top)
{
regex_t rx;
@@ -198,10 +202,10 @@
{
if (buf[0] == '#' || buf[0] == '\n')
continue;
- if (strncmp ("REGEXP", buf, 6) == 0 && isspace (buf[6]))
+ if (strncmp ("REGEXP", buf, 6) == 0 && ISSPACE (buf[6]))
{
pc = buf + 6;
- while (isspace (*pc))
+ while (ISSPACE (*pc))
pc++;
wc = regexp;
while (*pc && *pc != '\n')
@@ -235,10 +239,10 @@
}
*wc = 0;
}
- else if (strncmp ("COMMAND", buf, 7) == 0 && isspace (buf[7]))
+ else if (strncmp ("COMMAND", buf, 7) == 0 && ISSPACE (buf[7]))
{
pc = buf + 7;
- while (isspace (*pc))
+ while (ISSPACE (*pc))
pc++;
pc[ strlen (pc) - 1 ] = 0; /* kill the trailing newline */
strncpy (command, pc, sizeof (command) - 1);

34
urlview-0.9-default.patch Normal file
View file

@ -0,0 +1,34 @@
--- urlview-0.9/url_handler.sh.default 2000-07-04 12:14:30.000000000 +0200
+++ urlview-0.9/url_handler.sh 2007-06-27 17:21:31.000000000 +0200
@@ -28,15 +28,15 @@
# VT: Launch in the same terminal
# The lists of programs to be executed are
-https_prgs="/usr/X11R6/bin/netscape:XW /usr/bin/lynx:XT"
-http_prgs="/usr/bin/lynx:XT /usr/X11R6/bin/netscape:XW"
+https_prgs="/usr/bin/htmlview:XW /usr/bin/firefox:XW /usr/bin/seamonkey:XW /usr/bin/konqueror:XW /usr/bin/epiphany:XW /usr/bin/links:XT /usr/bin/lynx:XT"
+http_prgs="/usr/bin/htmlview:XW /usr/bin/firefox:XW /usr/bin/seamonkey:XW /usr/bin/konqueror:XW /usr/bin/epiphany:XW /usr/bin/links:XT /usr/bin/lynx:XT"
mailto_prgs="/usr/bin/mutt:VT /usr/bin/elm:VT /usr/bin/pine:VT /usr/bin/mail:VT"
-gopher_prgs="/usr/bin/lynx:XT /usr/bin/gopher:XT"
-ftp_prgs="/usr/bin/lynx:XT /usr/bin/ncftp:XT"
+gopher_prgs="/usr/bin/lynx:XT"
+ftp_prgs="/usr/bin/ncftp:XT /usr/bin/wget:XT /usr/bin/lynx:XT"
# Program used as an xterm (if it doesn't support -T you'll need to change
# the command line in getprg)
-XTERM=/usr/X11R6/bin/xterm
+XTERM=/usr/bin/xterm
###########################################################################
@@ -100,9 +100,7 @@ gopher)
prg=`getprg $gopher_prgs`
;;
*)
- echo "Unknown URL type. Please report URL and viewer to:"
- echo "joey@debian.org."
- echo -n "Press enter to continue."; read x
+ echo -n "Unknown URL type. Press enter to continue."; read x
exit
;;
esac

View file

@ -1,91 +0,0 @@
diff -up urlview/url_handler.sh.default urlview/url_handler.sh
--- urlview/url_handler.sh.default 2013-10-23 05:08:01.000000000 +0200
+++ urlview/url_handler.sh 2015-04-22 11:04:42.247546697 +0200
@@ -28,15 +28,15 @@
# VT: Launch in the same terminal
# The lists of programs to be executed are
-https_prgs="/usr/X11R6/bin/netscape:XW /usr/bin/lynx:XT"
-http_prgs="/usr/bin/lynx:XT /usr/X11R6/bin/netscape:XW"
+https_prgs="/usr/bin/htmlview:XW /usr/bin/firefox:XW /usr/bin/seamonkey:XW /usr/bin/konqueror:XW /usr/bin/epiphany:XW /usr/bin/links:XT /usr/bin/lynx:XT"
+http_prgs="/usr/bin/htmlview:XW /usr/bin/firefox:XW /usr/bin/seamonkey:XW /usr/bin/konqueror:XW /usr/bin/epiphany:XW /usr/bin/links:XT /usr/bin/lynx:XT"
mailto_prgs="/usr/bin/mutt:VT /usr/bin/elm:VT /usr/bin/pine:VT /usr/bin/mail:VT"
-gopher_prgs="/usr/bin/lynx:XT /usr/bin/gopher:XT"
-ftp_prgs="/usr/bin/lynx:XT /usr/bin/ncftp:XT"
+gopher_prgs="/usr/bin/lynx:XT"
+ftp_prgs="/usr/bin/ncftp:XT /usr/bin/wget:XT /usr/bin/lynx:XT"
# Program used as an xterm (if it doesn't support -T you'll need to change
# the command line in getprg)
-XTERM=/usr/X11R6/bin/xterm
+XTERM=/usr/bin/xterm
###########################################################################
@@ -100,9 +100,7 @@ gopher)
prg=`getprg $gopher_prgs`
;;
*)
- echo "Unknown URL type. Please report URL and viewer to:"
- echo "joey@debian.org."
- echo -n "Press enter to continue."; read x
+ echo -n "Unknown URL type. Press enter to continue."; read x
exit
;;
esac
diff -up urlview/urlview.c.default urlview/urlview.c
--- urlview/urlview.c.default 2013-10-23 05:08:01.000000000 +0200
+++ urlview/urlview.c 2015-04-22 11:04:42.248546700 +0200
@@ -50,8 +50,8 @@
#include "quote.h"
#define DEFAULT_REGEXP "(((http|https|ftp|gopher)|mailto):(//)?[^ <>\"\t]*|(www|ftp)[0-9]?\\.[-a-z0-9.]+)[^ .,;\t\n\r<\">\\):]?[^, <>\"\t]*[^ .,;\t\n\r<\">\\):]"
-#define DEFAULT_COMMAND "/etc/urlview/url_handler.sh %s"
-#define SYSTEM_INITFILE "/etc/urlview/system.urlview"
+#define DEFAULT_COMMAND "/usr/bin/url_handler.sh %s"
+#define SYSTEM_INITFILE "/etc/urlview.conf"
#define OFFSET 2
#define PAGELEN (LINES - 1 - OFFSET)
diff -up urlview/urlview.conf.suse.default urlview/urlview.conf.suse
--- urlview/urlview.conf.suse.default 2013-10-23 05:08:01.000000000 +0200
+++ urlview/urlview.conf.suse 2015-04-22 11:04:42.248546700 +0200
@@ -4,6 +4,6 @@
#
# The defaults are shown here:
#
-# REGEXP (((https?|ftp|gopher)://|(mailto|file|news):)[^' \t<>"]+|(www|web|w3)\.[-a-z0-9.]+)[^' \t.,;<>"\):]
-# COMMAND url_handler.sh '%s'
+# REGEXP (((http|https|ftp|gopher)|mailto):(//)?[^ <>\"\t]*|(www|ftp)[0-9]?\\.[-a-z0-9.]+)[^ .,;\t\n\r<\">\\):]?[^, <>\"\t]*[^ .,;\t\n\r<\">\\):]
+# COMMAND /usr/bin/url_handler.sh %s
#
diff -up urlview/urlview.man.default urlview/urlview.man
--- urlview/urlview.man.default 2013-10-23 05:08:01.000000000 +0200
+++ urlview/urlview.man 2015-04-22 11:05:51.930740825 +0200
@@ -35,7 +35,7 @@ attempts to read
upon startup. If this file
doesn't exist, it will try to read a system wide file
in
-.IR /etc/urlview/system.urlview .
+.IR /etc/urlview.conf .
There are two configuration commands (order does not matter):
.TP
REGEXP \fIregexp\fP
@@ -63,7 +63,7 @@ with the URL that was requested, otherwi
the COMMAND string. The default COMMAND is:
.br
.sp
-/etc/urlview/url_handler.sh
+/usr/bin/url_handler.sh
.PP
.B Note:
You should
@@ -84,7 +84,7 @@ QUITONLAUNCH
Will cause urlview to quit after you launch a URL.
.SH FILES
.PP
-.IP "/etc/urlview/system.urlview"
+.IP "/etc/urlview.conf"
system-wide urlview configuration file
.IP "~/.urlview"
urlview configuration file

View file

@ -1,23 +1,21 @@
%global gitdate 20131022
%global gitfullrev 08767aa863cd27d1755ba0aff65b8cc1a0c1446a
%global gitrev %(c=%{gitfullrev}; echo ${c:0:6})
Name: urlview
Version: 0.9
Release: 42.%{gitdate}git%{gitrev}%{?dist}
Release: 8%{?dist}
Summary: URL extractor/launcher
License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.0-or-later
URL: https://github.com/sigpipe/urlview
Source0: https://github.com/sigpipe/urlview/archive/%{gitrev}/urlview-%{gitrev}.tar.gz
Group: Applications/Internet
License: GPLv2+
URL: ftp://ftp.mutt.org/pub/mutt/contrib/urlview-0.9.README
Source0: ftp://ftp.mutt.org/pub/mutt/contrib/urlview-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: make
BuildRequires: gcc
BuildRequires: ncurses-devel
# mutt packages before 5:1.5.16-2 included urlview
Conflicts: mutt < 5:1.5.16-2
Patch1: urlview-default.patch
Patch1: urlview-0.9-build.diff
Patch2: urlview-0.9-default.patch
%description
urlview is a screen oriented program for extracting URLs from text
@ -25,135 +23,35 @@ files and displaying a menu from which you may launch a command to
view a specific item.
%prep
%setup -q -n %{name}-%{gitfullrev}
%patch -P1 -p1 -b .default
%setup -q
%patch1 -p1 -b .build
%patch2 -p1 -b .default
%build
%configure
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_mandir}/man{1,5}}
install -p -m644 urlview.conf.suse $RPM_BUILD_ROOT%{_sysconfdir}/urlview.conf
install -p urlview url_handler.sh $RPM_BUILD_ROOT%{_bindir}
install -p -m644 urlview.man $RPM_BUILD_ROOT%{_mandir}/man1/urlview.1
echo '.so man1/urlview.1' > $RPM_BUILD_ROOT%{_mandir}/man5/urlview.conf.5
echo '.so man1/urlview.1' > $RPM_BUILD_ROOT%{_mandir}/man1/url_handler.sh.1
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README sample.urlview
%config(noreplace) %{_sysconfdir}/urlview.conf
%{_bindir}/urlview
%{_bindir}/url_handler.sh
%{_mandir}/man1/urlview.1*
%{_mandir}/man1/url_handler.sh.1*
%{_mandir}/man5/urlview.conf.5*
%changelog
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-42.20131022git08767a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-41.20131022git08767a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-40.20131022git08767a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-39.20131022git08767a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-38.20131022git08767a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-37.20131022git08767a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Nov 01 2023 Tomas Korbar <tkorbar@redhat.com> - 0.9-36.20131022git08767a
- Add licenses to fully conform to SPDX
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-35.20131022git08767a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Mar 11 2023 Tomas Korbar <tkorbar@redhat.com> - 0.9-34.20131022git08767a
- Change the License tag to the SPDX format
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-33.20131022git08767a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-32.20131022git08767a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-31.20131022git08767a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-30.20131022git08767a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-29.20131022git08767a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-28.20131022git08767a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-27.20131022git08767a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-26.20131022git08767a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-25.20131022git08767a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-24.20131022git08767a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-23.20131022git08767a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-22.20131022git08767a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-21.20131022git08767a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-20.20131022git08767a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-19.20131022git08767a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9-18.20131022git08767a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Wed Apr 24 2015 Miroslav Lichvar <mlichvar@redhat.com> 0.9-17.20131022git08767a
- update to 20131022git08767a
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9-16.20121210git6cfcad
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9-15.20121210git6cfcad
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9-14.20121210git6cfcad
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Fri May 24 2013 Miroslav Lichvar <mlichvar@redhat.com> 0.9-13.20121210git6cfcad
- add man page link for url_handler.sh
- fix default paths in man page
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9-12.20121210git6cfcad
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Fri Dec 14 2012 Miroslav Lichvar <mlichvar@redhat.com> 0.9-11.20121210git6cfcad
- update to 20121210git6cfcad
- remove obsolete macros
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild