[svn] r4615 - in trunk/rpms: . iodine lftp libcli smart

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Fri Aug 4 16:50:18 CEST 2006 

Author: dag
Date: 2006-08-04 16:50:08 +0200 (Fri, 04 Aug 2006)
New Revision: 4615

Added:
   trunk/rpms/iodine/
   trunk/rpms/iodine/iodine.spec
   trunk/rpms/lftp/lftp-3.5.2-makefile.patch
   trunk/rpms/lftp/lftp-3.5.2-tsl.patch
   trunk/rpms/libcli/
   trunk/rpms/libcli/libcli.spec
Modified:
   trunk/rpms/lftp/lftp.spec
   trunk/rpms/smart/smart.spec
Log:
Updates

Added: trunk/rpms/iodine/iodine.spec
===================================================================
--- trunk/rpms/iodine/iodine.spec	2006-08-04 13:38:45 UTC (rev 4614)
+++ trunk/rpms/iodine/iodine.spec	2006-08-04 14:50:08 UTC (rev 4615)
@@ -0,0 +1,46 @@
+# $Id$
+# Authority: dag
+# Upstream: <code$kryo,se>
+
+Summary: Tunnel IPv4 data through a DNS server
+Name: iodine
+Version: 0.3.1
+Release: 1
+License: GPL
+Group: Applications/Internet
+URL: http://code.kryo.se/iodine/
+
+Source: http://code.kryo.se/iodine/iodine-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+#BuildRequires:
+#Requires:
+
+%description
+iodine lets you tunnel IPv4 data through a DNS server. This can be useful
+in different situations where internet access is firewalled, but DNS
+queries are allowed. 
+
+%prep
+%setup
+
+%build
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__install} -Dp -m0755 iodine %{buildroot}%{_bindir}/iodine
+%{__install} -Dp -m0755 iodined %{buildroot}%{_bindir}/iodined
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc CHANGELOG README
+%{_bindir}/iodine
+%{_bindir}/iodined
+
+%changelog
+* Thu Aug 03 2006 Dag Wieers <dag at wieers.com> - 0.3.1-1
+- Initial package. (using DAR)


Property changes on: trunk/rpms/iodine/iodine.spec
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + native

Added: trunk/rpms/lftp/lftp-3.5.2-makefile.patch
===================================================================
--- trunk/rpms/lftp/lftp-3.5.2-makefile.patch	2006-08-04 13:38:45 UTC (rev 4614)
+++ trunk/rpms/lftp/lftp-3.5.2-makefile.patch	2006-08-04 14:50:08 UTC (rev 4615)
@@ -0,0 +1,23 @@
+--- src/Makefile.am.orig        2006-07-27 08:14:13.000000000 +0200
++++ src/Makefile.am     2006-07-31 23:54:36.000000000 +0200
+@@ -117,5 +117,7 @@
+	case " $(LDFLAGS) " in *" -s "*) \
+		echo $(STRIP) $(DESTDIR)$(pkgverlibdir)/*.so; \
+		$(STRIP) $(DESTDIR)$(pkgverlibdir)/*.so;; \
+-	esac; else rmdir $(DESTDIR)$(pkgverlibdir) 2>/dev/null || true;
++	esac
++else
++	rmdir $(DESTDIR)$(pkgverlibdir) 2>/dev/null || true;
+ endif
+--- src/Makefile.in.orig        2006-07-31 23:54:41.000000000 +0200
++++ src/Makefile.in     2006-07-31 23:55:08.000000000 +0200
+@@ -1027,7 +1027,8 @@
+ @WITH_MODULES_TRUE@	case " $(LDFLAGS) " in *" -s "*) \
+ @WITH_MODULES_TRUE@		echo $(STRIP) $(DESTDIR)$(pkgverlibdir)/*.so; \
+ @WITH_MODULES_TRUE@		$(STRIP) $(DESTDIR)$(pkgverlibdir)/*.so;; \
+- at WITH_MODULES_TRUE@	esac; else rmdir $(DESTDIR)$(pkgverlibdir) 2>/dev/null || true;
++ at WITH_MODULES_TRUE@	esac
++ at WITH_MODULES_TRUE@	rmdir $(DESTDIR)$(pkgverlibdir) 2>/dev/null || true;
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:

Added: trunk/rpms/lftp/lftp-3.5.2-tsl.patch
===================================================================
--- trunk/rpms/lftp/lftp-3.5.2-tsl.patch	2006-08-04 13:38:45 UTC (rev 4614)
+++ trunk/rpms/lftp/lftp-3.5.2-tsl.patch	2006-08-04 14:50:08 UTC (rev 4615)
@@ -0,0 +1,21 @@
+Index: src/ftpclass.cc
+===================================================================
+RCS file: /home/lav/cvsroot/lftp/src/ftpclass.cc,v
+retrieving revision 1.393
+diff -u -p -r1.393 ftpclass.cc
+--- src/ftpclass.cc 6 Jul 2006 13:52:01 -0000       1.393
++++ src/ftpclass.cc 4 Aug 2006 05:50:36 -0000
+@@ -3056,7 +3056,12 @@ int  Ftp::FlushSendQueue(bool all)
+    {
+       DebugPrint("**** ",conn->control_send->ErrorText(),0);
+       if(conn->control_send->ErrorFatal())
+-	 SetError(FATAL,conn->control_send->ErrorText());
++	{
++	 if(conn->ssl_is_activated() && !ftps && !QueryBool("ssl-force",hostname))
++	  ResMgr::Set("ftp:ssl-allow",hostname,"no");
++	 else
++	  SetError(FATAL,conn->control_send->ErrorText());
++	}
+       DisconnectNow();
+       return MOVED;
+    }

Modified: trunk/rpms/lftp/lftp.spec
===================================================================
--- trunk/rpms/lftp/lftp.spec	2006-08-04 13:38:45 UTC (rev 4614)
+++ trunk/rpms/lftp/lftp.spec	2006-08-04 14:50:08 UTC (rev 4615)
@@ -8,12 +8,14 @@
 Summary: Sophisticated file transfer program
 Name: lftp
 Version: 3.5.2
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Internet
 URL: http://lftp.yar.ru/
 
 Source: http://ftp.yars.free.net/pub/source/lftp/lftp-%{version}.tar.bz2
+Patch0: lftp-3.5.2-tsl.patch
+Patch1: lftp-3.5.2-makefile.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: ncurses-devel, openssl-devel, pkgconfig, readline-devel, gcc-c++
@@ -27,10 +29,9 @@
 
 %prep
 %setup
+%patch0
+%patch1
 
-### FIXME: Remove syntax error in Makefile v3.5.2
-%{__perl} -pi.orig -e 's|esac; else rmdir|esac; rmdir|' Makefile.in */Makefile.in
-
 %build
 ### Workaround for broken openssl on RH9 and EL3
 export CPPFLAGS="-I/usr/kerberos/include"
@@ -42,7 +43,7 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
 %find_lang %{name}
 
 %clean
@@ -64,6 +65,9 @@
 %{_libdir}/liblftp-tasks.so.*
 
 %changelog
+* Fri Aug 04 2006 Dag Wieers <dag at wieers.com> - 3.5.2-2
+- Added patch to handle SSL errors gracefully.
+
 * Mon Jul 31 2006 Dag Wieers <dag at wieers.com> - 3.5.2-1
 - Updated to release 3.5.2.
 

Added: trunk/rpms/libcli/libcli.spec
===================================================================
--- trunk/rpms/libcli/libcli.spec	2006-08-04 13:38:45 UTC (rev 4614)
+++ trunk/rpms/libcli/libcli.spec	2006-08-04 14:50:08 UTC (rev 4615)
@@ -0,0 +1,62 @@
+# $Id$
+# Authority: dag
+
+Summary: Cisco-like telnet command-line library
+Version: 1.8.6
+Name: libcli
+Release: 1
+License: LGPL
+Group: Library/Communication
+URL: http://www.sf.net/projects/libcli/
+
+Source: http://dl.sf.net/libcli/libcli-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+%description
+libcli provides a shared library for including a Cisco-like command-line
+interface into other software. It's a telnet interface which supports
+command-line editing, history, authentication and callbacks for a
+user-definable function tree.
+
+%package devel
+Summary: Header files, libraries and development documentation for %{name}.
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+This package contains the header files, static libraries and development
+documentation for %{name}. If you like to develop programs using %{name},
+you will need to install %{name}-devel.
+
+%prep
+%setup
+
+%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}/|g' Makefile
+
+%build
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR="%{buildroot}" PREFIX="%{_prefix}"
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc COPYING README Doc/usersguide.html
+%{_libdir}/libcli.so.*
+
+%files devel
+%defattr(-, root, root, 0755)
+%doc clitest.txt Doc/developers.html
+%{_includedir}/libcli.h
+%{_libdir}/libcli.so
+
+%changelog
+* Fri Aug 04 2006 Dag Wieers <dag at wieers.com> - 1.8.6-1
+- Initial package. (using DAR)


Property changes on: trunk/rpms/libcli/libcli.spec
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + native

Modified: trunk/rpms/smart/smart.spec
===================================================================
--- trunk/rpms/smart/smart.spec	2006-08-04 13:38:45 UTC (rev 4614)
+++ trunk/rpms/smart/smart.spec	2006-08-04 14:50:08 UTC (rev 4615)
@@ -8,6 +8,7 @@
 %{!?dist: %define fc4 1}
 
 %{?el4:%define _without_channels 1}
+%{?el3:%define _without_channels 1}
 %{?el3:%define _without_gui 1}
 
 %define desktop_vendor rpmforge
@@ -19,8 +20,8 @@
 
 Summary: Next generation package handling tool
 Name: smart
-Version: 0.41
-Release: 2.2
+Version: 0.42
+Release: 1
 License: GPL
 Group: Applications/System
 URL: http://www.smartpm.org/
@@ -174,7 +175,7 @@
 #%{__install} -Dp -m0755 %{SOURCE1} %{buildroot}%{python_dir}/smart/plugins/channelsync.py
 
 %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/smart/channels/
-%{__cp} -apv *.channel %{buildroot}%{_sysconfdir}/smart/channels/
+%{!?_without_channels:%{__cp} -apvf *.channel %{buildroot}%{_sysconfdir}/smart/channels/}
 
 %{__install} -d -m0755 %{buildroot}%{_localstatedir}/lib/smart/
 
@@ -201,6 +202,7 @@
 %files -f %{name}.lang
 %defattr(-, root, root, 0755)
 %doc HACKING IDEAS LICENSE README TODO doc/*
+%doc %{_mandir}/man8/smart.8*
 %config %{_prefix}/lib/smart/distro.py
 %dir %{_prefix}/lib/smart/
 %config(noreplace) %{_sysconfdir}/smart/channels/
@@ -239,8 +241,8 @@
 %endif
 
 %changelog
-* Tue Apr 11 2006 Dries Verachtert <dries at ulyssis.org> - 0.41-2.2
-- Rebuild for Fedora Core 5.
+* Fri Dec 23 2005 Dag Wieers <dag at wieers.com> - 0.42-1
+- Updated to release 0.42.
 
 * Fri Dec 23 2005 Dag Wieers <dag at wieers.com> - 0.41-2
 - Removed standard rpm-sys channel.

More information about the svn-commits mailing list