[packages/gofish] - updated to 1.2

qboosh qboosh at pld-linux.org
Sat Apr 11 16:55:16 CEST 2026


commit 3fcf18f661a3fd0f1464dd97e63c6846f612d5e9
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Apr 11 16:55:49 2026 +0200

    - updated to 1.2

 gofish-PLD.patch | 86 +++++++++++++++++++++++---------------------------------
 gofish-man.patch |  9 +++---
 gofish.spec      | 45 ++++++++++++++++-------------
 3 files changed, 65 insertions(+), 75 deletions(-)
---
diff --git a/gofish.spec b/gofish.spec
index 0dae07b..4a02928 100644
--- a/gofish.spec
+++ b/gofish.spec
@@ -1,17 +1,17 @@
 Summary:	A Gopher Server
 Summary(pl.UTF-8):	Serwer protokołu gopher
 Name:		gofish
-Version:	0.22
-Release:	6
-License:	GPL
+Version:	1.2
+Release:	1
+License:	GPL v2+
 Group:		Networking/Daemons
-Source0:	http://dl.sourceforge.net/gofish/%{name}-%{version}.tar.gz
-# Source0-md5:	d8ae50689d86344e8f279a915ed31844
+Source0:	https://downloads.sourceforge.net/gofish/%{name}-%{version}.tar.gz
+# Source0-md5:	a44fc268354ec97324fa25572910c412
 Source1:	%{name}.logrotate
 Source2:	gopherd.init
 Patch0:		%{name}-PLD.patch
 Patch1:		%{name}-man.patch
-URL:		http://gofish.sourceforge.net/
+URL:		https://gofish.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
 Requires(pre):	/bin/id
@@ -50,29 +50,34 @@ GoFish musi być uruchamiany z prawami roota, aby użyć portu 70,
 zmienia uprawnienia na zwykłego użytkownika przed dostępem do plików.
 
 %prep
-%setup -q
+%setup -q -n %{name}
 %patch -P0 -p1
 %patch -P1 -p1
 
 %build
-rm -f missing
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+	ac_cv_lib_nsl_gethostbyname=no \
+	ac_cv_lib_socket_socket=no \
+	--with-gopherroot=/home/services/gopherd
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/etc/{logrotate.d,rc.d/init.d},/var/log/gofish}
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	rootdir=/home/services/gopherd
+%{__make} install install-root-dir \
+	DESTDIR=$RPM_BUILD_ROOT
+
+# packaged as %doc
+%{__rm} $RPM_BUILD_ROOT/home/services/gopherd/Configure_GoFish
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/gopherd
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/gopherd
 
 touch $RPM_BUILD_ROOT/var/log/gofish/{gopherd,gofish}.log
 
@@ -85,11 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README TODO
+%doc AUTHORS ChangeLog Configure_GoFish README TODO
 %attr(755,root,root) %{_bindir}/check-files
-%attr(755,root,root) %{_bindir}/gmap2cache
 %attr(755,root,root) %{_bindir}/mkcache
-%attr(755,root,root) %{_bindir}/webtest
 %attr(755,root,root) %{_sbindir}/gofish
 # symlink
 %{_sbindir}/gopherd
@@ -97,11 +100,15 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gofish-www.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/gofish.logrotate
 %attr(754,root,root) /etc/rc.d/init.d/gopherd
-%attr(750,gopher,gopher) /home/services/gopherd
+%attr(750,gopher,gopher) %dir /home/services/gopherd
+%ghost /home/services/gopherd/.cache
+%config(noreplace) %verify(not md5 mtime size) /home/services/gopherd/.gopher+
+%attr(750,gopher,gopher) %dir /home/services/gopherd/icons
+%config(noreplace) %verify(not md5 mtime size) /home/services/gopherd/icons/gofish.gif
+%config(noreplace) %verify(not md5 mtime size) /home/services/gopherd/icons/gopher_*.gif
 %attr(755,gopher,gopher) %dir /var/log/gofish
 %ghost /var/log/gofish/gopherd.log
 %ghost /var/log/gofish/gofish.log
-%{_mandir}/man1/gmap2cache.1*
 %{_mandir}/man1/gofish.1*
 %{_mandir}/man1/gopherd.1*
 %{_mandir}/man1/mkcache.1*
diff --git a/gofish-PLD.patch b/gofish-PLD.patch
index 4e6e8b0..2a91e98 100644
--- a/gofish-PLD.patch
+++ b/gofish-PLD.patch
@@ -1,52 +1,41 @@
-diff -u gofish-0.20.orig/Configure_GoFish gofish-0.20/Configure_GoFish
---- gofish-0.20.orig/Configure_GoFish	Tue Sep  3 01:40:09 2002
-+++ gofish-0.20/Configure_GoFish	Sat Nov  2 14:22:16 2002
-@@ -7,7 +7,7 @@
+--- gofish/Configure_GoFish.orig	2010-10-04 05:03:49.000000000 +0200
++++ gofish/Configure_GoFish	2026-04-11 16:06:45.115475267 +0200
+@@ -7,7 +7,7 @@ which where provided as part of the GoFi
  
  For the really impatient:
  
--    1) Add some files and/or directories to /var/lib/gopherd
+-    1) Add some files and/or directories to /var/gopher
 +    1) Add some files and/or directories to /home/services/gopherd
      2) Run `mkcache -r'
      3) Sit back and wait for the hits
  
-@@ -19,7 +19,7 @@
+@@ -19,7 +19,7 @@ The Gopher spec is defined in RFC 1436 "
  Links below).  The important thing to remember is that gopher is ment
  to share files. It uses a directory structure to layout the files. The
  root directory is the base directory that all files descend from. In
--GoFish the root directory defaults to /var/lib/gopherd.
+-GoFish the root directory defaults to /var/gopher.
 +GoFish the root directory defaults to /home/services/gopherd.
  
  GoFish requires a special file called ".cache" in each directory you
  want to serve files from. There is a man page provided with GoFish on
-diff -u gofish-0.20.orig/Makefile.am gofish-0.20/Makefile.am
---- gofish-0.20.orig/Makefile.am	Sat Nov  2 07:34:43 2002
-+++ gofish-0.20/Makefile.am	Sat Nov  2 14:21:56 2002
-@@ -29,7 +29,7 @@
- 	  $(INSTALL_DATA) gofish-www.conf $(DESTDIR)$(sysconfdir)/gofish-www.conf; \
- 	fi
- 
--# 1. Only install Configure_GoFish if /var/lib/gopherd does not exist.
-+# 1. Only install Configure_GoFish if /home/services/gopherd does not exist.
- #    We don't want to keep installing it for users who are upgrading.
- # 2. Only install the .gopher+ file if it dosen't exist. We don't want to
- #    override any user changes.
-diff -u gofish-0.20.orig/check-files gofish-0.20/check-files
---- gofish-0.20.orig/check-files	Fri Oct  4 03:22:44 2002
-+++ gofish-0.20/check-files	Sat Nov  2 14:22:03 2002
+--- gofish/check-files.orig	2010-10-04 05:03:49.000000000 +0200
++++ gofish/check-files	2026-04-11 16:09:58.377761609 +0200
 @@ -1,6 +1,6 @@
  #!/bin/sh
  
--cd /var/lib/gopherd
+-cd /var/gopher
 +cd /home/services/gopherd
  
  for cache in `find . -name .cache`; do
    for f in `grep -v "^[19].*$" $cache | cut -f2 | cut -c3-`; do
-diff -u gofish-0.20.orig/gofish-www.conf gofish-0.20/gofish-www.conf
---- gofish-0.20.orig/gofish-www.conf	Sun Oct 27 00:00:20 2002
-+++ gofish-0.20/gofish-www.conf	Sat Nov  2 14:51:52 2002
-@@ -7,7 +7,7 @@
- root = /home/httpd
+--- gofish/gofish-www.conf.orig	2010-10-04 05:03:49.000000000 +0200
++++ gofish/gofish-www.conf	2026-04-11 16:19:31.514656660 +0200
+@@ -4,10 +4,10 @@
+ # editing a line.
+ 
+ # The root directory for the web site(s)
+-root = /var/www/html
++root = /home/services/gopherd
  
  # The logfile
 -logfile = /var/log/gofish.log
@@ -54,28 +43,26 @@ diff -u gofish-0.20.orig/gofish-www.conf gofish-0.20/gofish-www.conf
  
  # The pidfile (used when starting/stopping the server)
  pidfile = /var/run/gofish.pid
-diff -u gofish-0.20.orig/gofish.5 gofish-0.20/gofish.5
---- gofish-0.20.orig/gofish.5	Thu Oct 24 02:36:58 2002
-+++ gofish-0.20/gofish.5	Sat Nov  2 14:52:59 2002
-@@ -56,8 +56,8 @@
+--- gofish/gofish.5.orig	2010-10-04 05:03:49.000000000 +0200
++++ gofish/gofish.5	2026-04-11 16:20:18.914399873 +0200
+@@ -67,8 +67,8 @@ and port if necessary.
  .SH EXAMPLE
  .nf
  # GoFish Gopher Server configuration file
--root = /var/lib/gopherd
+-root = /var/gopher
 -logfile = /var/log/gopherd
-+root = /home/services/gopherd
++root = /home/services/hopherd
 +logfile = /var/log/gofish/gopherd.log
  pidfile = /var/run/gopherd.pid
  port = 70
  uid = 13
-diff -u gofish-0.20.orig/gofish.conf gofish-0.20/gofish.conf
---- gofish-0.20.orig/gofish.conf	Thu Oct 24 02:36:58 2002
-+++ gofish-0.20/gofish.conf	Sat Nov  2 14:51:06 2002
+--- gofish/gofish.conf.orig	2010-10-04 05:03:49.000000000 +0200
++++ gofish/gofish.conf	2026-04-11 16:21:55.930540958 +0200
 @@ -4,10 +4,10 @@
  # editing a line.
  
  # The root directory for the gopherspace
--;root = /var/lib/gopherd
+-;root = /var/gopher
 +;root = /home/services/gopherd
  
  # The logfile
@@ -84,20 +71,17 @@ diff -u gofish-0.20.orig/gofish.conf gofish-0.20/gofish.conf
  
  # The pidfile (used when starting/stopping the server)
  ;pidfile = /var/run/gopherd.pid
-diff -u gofish-0.20.orig/gofish.h gofish-0.20/gofish.h
---- gofish-0.20.orig/gofish.h	Sat Nov  2 07:19:51 2002
-+++ gofish-0.20/gofish.h	Sat Nov  2 14:52:17 2002
-@@ -37,8 +37,8 @@
+--- gofish/gofish.h.orig	2010-10-07 08:15:31.000000000 +0200
++++ gofish/gofish.h	2026-04-11 16:23:38.393319203 +0200
+@@ -49,7 +49,7 @@
  
- // If you leave GOPHER_HOST unset, it will default to your
- // your hostname.
--#define GOPHER_ROOT		"/var/lib/gopherd"
--#define GOPHER_LOGFILE	"/var/log/gopherd.log"
-+#define GOPHER_ROOT		"/home/services/gopherd"
-+#define GOPHER_LOGFILE	"/var/log/gofish/gopherd.log"
- #define GOPHER_PIDFILE	"/var/run/gopherd.pid"
- #define GOPHER_CONFIG	"/etc/gofish.conf"
- // #define GOPHER_HOST		""
+ /* If you leave GOPHER_HOST unset, it will default to your
+  * your hostname. */
+-#define GOPHER_LOGFILE	LOCALSTATEDIR "/log/gofish.log"
++#define GOPHER_LOGFILE	LOCALSTATEDIR "/log/gofish/gopherd.log"
+ #define GOPHER_PIDFILE	LOCALSTATEDIR "/run/gofish.pid"
+ #define GOPHER_CONFIG	SYSCONFDIR "/gofish.conf"
+ /* #define GOPHER_HOST		"" */
 diff -u gofish-0.20.orig/gopherd.1 gofish-0.20/gopherd.1
 --- gofish-0.20.orig/gopherd.1	Fri Aug 16 19:30:45 2002
 +++ gofish-0.20/gopherd.1	Sat Nov  2 14:53:12 2002
diff --git a/gofish-man.patch b/gofish-man.patch
index f3c2b40..5de599d 100644
--- a/gofish-man.patch
+++ b/gofish-man.patch
@@ -28,10 +28,9 @@ diff -u gofish-0.20.orig/dotcache.5 gofish-0.20/dotcache.5
  .PP
  GoFish must run as root to be able to accept connections on the
  privileged port 70.  However, it does not need to be root to serve the
-diff -u gofish-0.20.orig/gofish.5 gofish-0.20/gofish.5
---- gofish-0.20.orig/gofish.5	Thu Oct 24 02:36:58 2002
-+++ gofish-0.20/gofish.5	Sat Nov  2 14:52:59 2002
-@@ -11,7 +11,7 @@
+--- gofish/gofish.5.orig	2026-04-11 16:24:19.976427262 +0200
++++ gofish/gofish.5	2026-04-11 16:26:37.359016329 +0200
+@@ -11,7 +11,7 @@ running two gopher servers on seperate p
  This file is also read by the
  .B mkcache
  program to get the root, hostname, and port entries.
@@ -39,4 +38,4 @@ diff -u gofish-0.20.orig/gofish.5 gofish-0.20/gofish.5
 +.SH "FILE FORMAT"
  .PP
  The GoFish configuration file is a simple ascii text file with option
- = data pairs. All lines not starting in an alphabetic (a-z) character
+ = data pairs. All lines not starting in an alphabetic (a\-z) character
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gofish.git/commitdiff/3fcf18f661a3fd0f1464dd97e63c6846f612d5e9



More information about the pld-cvs-commit mailing list