2015-01-25 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* gnutls, scim-bridge: rebuilt
	* rusers, rwho: added patches
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9292 ec354946-7b23-47d6-9f5a-488ba84defc7

g/gnutls/gnutls-vl.spec

@@ -4,7 +4,7 @@ Summary:	GNU TLS Library
 Summary(ja):	GNU TLS ライブラリ
 Name:		gnutls
 Version:	3.2.20
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 License:	GPLv3+ and LGPLv2+
 # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+
 Group:		System Environment/Libraries
@@ -23,19 +23,15 @@ Patch100: gnutls-3.2.10_guile_build.patch
 # Nothing...
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-
+BuildRequires:	libtasn1-devel >= 3.1
-# BuildRequires: libgcrypt-devel >= 1.2.2
+BuildRequires:	gmp-devel
-BuildRequires: libtasn1-devel >= 3.1
+BuildRequires:	gettext readline-devel libtool
-BuildRequires: gmp-devel, zlib-devel
+BuildRequires:	guile-devel >= 1.8.6
-BuildRequires: gettext readline-devel libtool
+BuildRequires:	p11-kit-devel >= 0.11
-BuildRequires: guile-devel >= 1.8.6
+BuildRequires:	nettle-devel >= 2.7
-# BuildRequires: lzo-devel
+BuildRequires:	texinfo, autogen
-BuildRequires: p11-kit-devel >= 0.11
+BuildRequires:	zlib-devel
-BuildRequires: nettle-devel >= 2.7
-BuildRequires: texinfo, autogen
-# Requires:	libgcrypt >= 1.2.2, zlib
 Requires:      zlib
-# Requires:	lzo
 
 Requires(post):   ldconfig
 Requires(postun): ldconfig
@@ -151,8 +147,7 @@ This package contains Guile bindings for the library.
 #'
 
 %prep
-# %setup -q -n %{name}-3.2.12
+%setup -q
-%setup 
 
 %patch1 -p1 -b .rpath
 %patch3 -p1 -b .nosrp
@@ -202,7 +197,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gnutls-dane.pc
 
 # remove unneeded files
 %__rm -f %{buildroot}%{_libdir}/*.la
-%__rm -f %{buildroot}%{_libdir}/guile/1.8/*.la
+%__rm -f %{buildroot}%{_libdir}/guile/2.0/*.la
 
 %find_lang gnutls
 
@@ -266,7 +261,7 @@ fi
 
 %files guile
 %defattr(-,root,root,-)
-%{_libdir}/guile/1.8/guile*.so*
+%{_libdir}/guile/2.0/guile*.so*
 %{_datadir}/guile/site/gnutls
 %{_datadir}/guile/site/gnutls.scm
 
@@ -287,10 +282,13 @@ fi
 
 %files -n compat32-%{name}-guile
 %defattr(-,root,root,-)
-%{_libdir}/guile/1.8/guile*.so*
+%{_libdir}/guile/2.0/guile*.so*
 %endif
 
 %changelog
+* Sun Jan 25 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.2.20-2
+- rebuilt with guile 2.0.11
+
 * Tue Nov 18 2014 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 3.2.20-1
 - new upstream release with security fix   
 

r/rusers/rusers-vl.spec

@@ -2,10 +2,11 @@ Summary:     Displays the users logged into machines on the local network.
 Summary(ja): ローカルネットワーク上のマシンにログインしたユーザを表示する
 Name: rusers
 Version: 0.17
-Release: 48%{?_dist_release}
+Release: 81%{?_dist_release}
 
 License: BSD
-Group: Applications/Internet
+Group: Applications/System
+URL: http://rstatd.sourceforge.net/
 
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-rusers-%{version}.tar.gz
 Source1: rusersd.init
@@ -29,6 +30,8 @@ Patch14: netkit-rusers-0.17-procdiskstats.patch
 Patch15: netkit-rusers-0.17-rusersd-droppriv.patch
 # Oracle explicitly gave permission for this relicensing on August 18, 2010.
 Patch16: netkit-rusers-0.17-new-rpc-license.patch
+Patch17: rusers-0.17-manhelp.patch
+Patch18: rusers-0.17-freerpc.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: procps
@@ -56,7 +59,7 @@ rusers パッケージをインストールして下さい．
 Summary: Server for the rusers protocol.
 Summary(ja): rusers プロトコルのサーバ
 Group: System Environment/Daemons
-#Prereq: /sbin/chkconfig /etc/init.d
+Requires: initscripts
 Requires(pre): /sbin/chkconfig
 Requires: portmap
 
@@ -102,33 +105,46 @@ who に似た出力をしますが，引数で指定したホストあるいは
 %patch14 -p1 -b .procdiskstats
 %patch15 -p1 -b .dropprivs
 %patch16 -p1 -b .licensefix
+%patch17 -p1 -b .manhelp
+%patch18 -p1 -b .freerpc
 
 %build
-sh configure
+cat > MCONFIG <<EOF
-perl -pi -e '
+# Generated by configure (confgen version 2) on Wed Jul 17 09:33:22 EDT 2002
-    s,^CC=.*$,CC=cc,;
+#
-    s,-O2,\$(RPM_OPT_FLAGS),;
+
-    s,^BINDIR=.*$,BINDIR=%{_bindir},;
+BINDIR=%{_bindir}
-    s,^MANDIR=.*$,MANDIR=%{_mandir},;
+SBINDIR=%{_sbindir}
-    s,^SBINDIR=.*$,SBINDIR=%{_sbindir},;
+MANDIR=%{_mandir}
-    ' MCONFIG
+BINMODE=755
+DAEMONMODE=755
+MANMODE=644
+PREFIX=/usr
+EXECPREFIX=/usr
+INSTALLROOT=
+CC=cc
+CFLAGS=${RPM_OPT_FLAGS} -fPIC -Wall -W -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline 
+LDFLAGS=-pie -Wl,-z,relro,-z,now
+#LIBS=-lsystemd
+USE_GLIBC=1
+
+EOF
 
 make
 make -C rpc.rstatd
 
-
 %install
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
-mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man{1,8}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{1,8}
-mkdir -p ${RPM_BUILD_ROOT}%{_initdir}
+mkdir -p $RPM_BUILD_ROOT%{_initdir}
 
-make INSTALLROOT=${RPM_BUILD_ROOT} install
+make INSTALLROOT=$RPM_BUILD_ROOT install
-make INSTALLROOT=${RPM_BUILD_ROOT} install -C rpc.rstatd
+make INSTALLROOT=$RPM_BUILD_ROOT install -C rpc.rstatd
 
-install -m 755 $RPM_SOURCE_DIR/rusersd.init ${RPM_BUILD_ROOT}%{_initdir}/rusersd
+install -m 755 %{SOURCE1} ${RPM_BUILD_ROOT}%{_initdir}/rusersd
-install -m 755 $RPM_SOURCE_DIR/rstatd.init ${RPM_BUILD_ROOT}%{_initdir}/rstatd
+install -m 755 %{SOURCE3} ${RPM_BUILD_ROOT}%{_initdir}/rstatd
 
 
 %clean
@@ -164,6 +180,14 @@ fi
 
 
 %changelog
+* Sun Jan 25 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.17-81
+- added Patch17 and 18 from Fedora 0.17-80
+  * Fri Jul 26 2013 Honza Horak <hhorak@redhat.com> - 0.17-77
+  - Free already alocated memory when parsing of RPC request failed
+  * Mon May 20 2013 Honza Horak <hhorak@redhat.com> - 0.17-75
+  - Fix man page vs. help differences
+- moved to Applications/System
+
 * Sun May  1 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.17-48
 - rebuilt with current VineSeed
 - added Patch 14, 15 and 16 from FC

r/rwho/rwho-vl.spec

@@ -2,10 +2,11 @@ Summary:     Displays who is logged in to local network machines.
 Summary(ja): ローカルネットワーク機に誰がログインしているか表示する
 Name: rwho
 Version: 0.17
-Release: 27%{?_dist_release}
+Release: 55%{?_dist_release}
 
-License: BSD
+# part of rwhod is under GPL+, other parts are under BSD
-Group: Applications/Internet
+License: BSD and GPL+
+Group: System Environment/Daemons
 
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-rwho-%{version}.tar.gz
 Source1: rwhod.init
@@ -18,7 +19,10 @@ Patch5: netkit-rwho-0.17-include.patch
 Patch6: netkit-rwho-0.17-wd_we.patch
 Patch7: netkit-rwho-0.17-time.patch
 Patch8: netkit-rwho-0.17-gcc4.patch
-Patch9: netkit-rwho-0.17-getloadavg.patch
+Patch9: rwho-0.17-waitchild.patch
+Patch10: rwho-0.17-neighbours.patch
+Patch11: rwho-0.17-hostnamelen.patch
+Patch12: rwho-0.17-stderr.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 #Requires: /sbin/chkconfig /etc/init.d
@@ -49,37 +53,43 @@ rwho コマンドは who コマンド (誰がログインしているかを表
 %patch2 -p1 -b .fixbcast
 %patch3 -p1 -b .fixhostname
 %patch4 -p1 -b .strip
-%patch9 -p0 -b .getloadavg
+%patch5 -p1 -b .include
-
+%patch6 -p1 -b .wd_we
-%build
+%patch7 -p1 -b .time
-sh configure
+%patch8 -p1 -b .gcc4
-perl -pi -e '
+%patch9 -p1 -b .waitchild
-    s,^CC=.*$,CC=cc,;
+%patch10 -p1 -b .neighbours
-    s,-O2,\$(RPM_OPT_FLAGS),;
+%patch11 -p1 -b .hostnamelen
+%patch12 -p1 -b .stderr
+
+%{__perl} -pi -e '
+    s|^LDFLAGS=|LDFLAGS="-pie -Wl,-z,relro,-z,now"|;
     s,^BINDIR=.*$,BINDIR=%{_bindir},;
     s,^MANDIR=.*$,MANDIR=%{_mandir},;
     s,^SBINDIR=.*$,SBINDIR=%{_sbindir},;
-    ' MCONFIG
+    ' configure
-
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
 
+%build
+CFLAGS="$RPM_OPT_FLAGS -I../include -fPIC" \
+sh configure --with-c-compiler=gcc
+make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
-mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man{1,8}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{1,8}
-mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-mkdir -p ${RPM_BUILD_ROOT}%{_initdir}
+mkdir -p $RPM_BUILD_ROOT%{_initdir}
-mkdir -p ${RPM_BUILD_ROOT}/var/spool/rwho
+mkdir -p $RPM_BUILD_ROOT/var/spool/rwho
 
-make INSTALLROOT=${RPM_BUILD_ROOT} install
+make INSTALLROOT=$RPM_BUILD_ROOT install
-make INSTALLROOT=${RPM_BUILD_ROOT} install -C ruptime
+make INSTALLROOT=$RPM_BUILD_ROOT install -C ruptime
 
-install -m 755 $RPM_SOURCE_DIR/rwhod.init ${RPM_BUILD_ROOT}%{_initdir}/rwhod
+install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initdir}/rwhod
 
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 
 
 %post
@@ -99,7 +109,6 @@ fi
 %{_mandir}/man1/ruptime.1*
 %{_bindir}/rwho
 %{_mandir}/man1/rwho.1*
-
 %{_sbindir}/rwhod
 %{_mandir}/man8/rwhod.8*
 /var/spool/rwho
@@ -107,6 +116,21 @@ fi
 
 
 %changelog
+* Sun Jan 25 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.17-55
+- added Patch9, 10, 11 and 12 from Fedora 0.17-54
+  * Wed Nov 07 2012 Honza Horak <hhorak@redhat.com> - 0.17-47
+  - Remove linkage against systemd-daemon
+  - Print errors into stderr
+  * Wed Dec 07 2011 Honza Horak <hhorak@redhat.com> - 0.17-37
+  - allow longer hostnames (bug #212076)
+  - add -n option to ruptime manpage
+  * Thu Jun 02 2011 Honza Horak <hhorak@redhat.com> - 0.17-35
+  - applied patch from Ian Donaldson to transmit status reliably
+    (bug #708385)
+  * Tue Aug 15 2006 Harald Hoyer <harald@redhat.com> - 0.17-26
+  - exit daemon, if child process dies (bug #202493)
+- moved to System Environment/Daemons
+					
 * Sun May  1 2011 Shu KONNO <owa@bg.wakwak.com> 0.17-27
 - rebuilt with current VineSeed
 

s/scim-bridge/scim-bridge-vl.spec

@@ -2,10 +2,10 @@
 
 %define name scim-bridge
 %define version 0.4.16
-%define release 17%{?_dist_release}
+%define release 18%{?_dist_release}
 
 %define qt3_ver 3.3.8
-%define qt4_ver 4.8.5
+%define qt4_ver 4.8.6
 
 # build qt3 immodule ("--without qt3" to disable qt3)
 %bcond_without qt3
@@ -31,7 +31,7 @@ Group: System Environment/Libraries
 License: GPL/LGPL
 URL: http://www.scim-im.org/projects/scim_bridge
 
-Source0: http://1jaist.dl.sourceforge.net/sourceforge/scim/%{name}-%{version}.tar.gz
+Source0: http://jaist.dl.sourceforge.net/sourceforge/scim/%{name}-%{version}.tar.gz
 
 # Patch from Fedora 10
 Patch0: scim-bridge-0.4.15-fix-gdm.patch
@@ -119,7 +119,7 @@ Summary:        SCIM Bridge GTK IM Module
 Summary(ja):    SCIM Bridge GTK IM モジュール
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       gtk2 >= 2.14.0
+Requires:       compat32-gtk2 >= 2.14.0
 Requires(post): gtk2 >= 2.14.0
 Requires(postun): gtk2 >= 2.14.0
 
@@ -135,7 +135,7 @@ Summary:        SCIM Bridge Qt IM Module
 Summary(ja):    SCIM Bridge Qt IM モジュール
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       qt = %{_qt3_version}
+Requires:       compat32-qt >= %{_qt3_version}
 BuildRequires:  qt-devel 
 
 %description -n compat32-%{name}-qt
@@ -151,7 +151,7 @@ Summary:        SCIM Bridge Qt4 IM Module
 Summary(ja):    SCIM Bridge Qt4 IM モジュール
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       qt4 = %{_qt4_version}
+Requires:       compat32-qt4 >= %{_qt4_version}
 BuildRequires:  qt4-devel
 
 %description -n compat32-%{name}-qt4
@@ -162,7 +162,6 @@ This package provides the SCIM Bridge Qt4 IM module.
 %endif
 
 
-
 %prep
 %setup -q
 %patch0 -p1 -b .0-fix-gdm
@@ -268,6 +267,9 @@ export QT4_PREFIX=%{_qt4_prefix}
 
 
 %changelog
+* Sun Jan 25 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.4.16-18
+- fixed compat32 Requires
+
 * Mon Dec 30 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.4.16-17
 - rebuild with VineSeed environment
 - add Patch100 (scim-bridge-0.4.16-header.patch)