Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=51699555c8396bc47eae3dab573d396b1bf9eb3f
commit 51699555c8396bc47eae3dab573d396b1bf9eb3f Author: Miklos Vajna <[EMAIL PROTECTED]> Date: Fri Nov 23 23:29:51 2007 +0100 revert "libssh-0.11-1-i686" - this reverts commit d4f6f734b864b796ebfed4edc51978c7edf8447f - this author is sooooo stupid.. so 0.11 is older than 0.2.. diff --git a/source/lib-extra/libssh/FrugalBuild b/source/lib-extra/libssh/FrugalBuild index 136c615..e14958b 100644 --- a/source/lib-extra/libssh/FrugalBuild +++ b/source/lib-extra/libssh/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos <[EMAIL PROTECTED]> pkgname=libssh -pkgver=0.11 +pkgver=0.2 pkgrel=1 pkgdesc="The SSH library" url="http://www.0xbadc0de.be/wiki/libssh:libssh"; @@ -11,7 +11,9 @@ groups=('lib-extra') archs=('i686' 'x86_64') up2date="lynx -dump 'http://0xbadc0de.be/libssh/?C=M;O=A'|Flasttgz" source=(http://0xbadc0de.be/libssh/libssh-$pkgver.tgz \ - libssh-0.11-include.diff) -sha1sums=('307430249ded90332c4ec77a264913b3bc93a648' \ - 'd55dff68456a7ccb6eb2a65858d26566b95b1f28') + libssh-0.2-include.diff \ + libssh-0.2-smp.diff) +sha1sums=('bde7652da5a0f79127c3d5e4b9383d3a07619344'\ + '0b105dfb61307ee3b8215b147b5cc17fdd94d2ff'\ + 'd96a6e654b34050f15e8fc501863e92dead8c674') # optimization OK diff --git a/source/lib-extra/libssh/libssh-0.11-include.diff b/source/lib-extra/libssh/libssh-0.11-include.diff deleted file mode 100644 index 3b57b08..0000000 --- a/source/lib-extra/libssh/libssh-0.11-include.diff +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naur libssh-0.11.orig/Makefile.in libssh-0.11/Makefile.in ---- libssh-0.11.orig/Makefile.in 2005-03-04 20:54:59.000000000 +0100 -+++ libssh-0.11/Makefile.in 2007-11-23 23:13:51.000000000 +0100 -@@ -56,11 +56,11 @@ - || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" - $(top_srcdir)/mkinstalldirs $(incldir)/libssh -- $(INSTALL) include/libssh/libssh.h $(incldir)/libssh/ -- $(INSTALL) include/libssh/config.h $(incldir)/libssh/ -- $(INSTALL) include/libssh/sftp.h $(incldir)/libssh/ -- $(INSTALL) include/libssh/crypto.h $(incldir)/libssh/ -- $(INSTALL) include/libssh/server.h $(incldir)/libssh/ -+ $(INSTALL) -m644 include/libssh/libssh.h $(incldir)/libssh/ -+ $(INSTALL) -m644 include/libssh/config.h $(incldir)/libssh/ -+ $(INSTALL) -m644 include/libssh/sftp.h $(incldir)/libssh/ -+ $(INSTALL) -m644 include/libssh/crypto.h $(incldir)/libssh/ -+ $(INSTALL) -m644 include/libssh/server.h $(incldir)/libssh/ - clean: - /bin/rm -f *~ *.o ssh sftp - @for dir in ${subdirs}; do \ diff --git a/source/lib-extra/libssh/libssh-0.2-include.diff b/source/lib-extra/libssh/libssh-0.2-include.diff new file mode 100644 index 0000000..b20f304 --- /dev/null +++ b/source/lib-extra/libssh/libssh-0.2-include.diff @@ -0,0 +1,24 @@ +diff -Naur libssh-0.2.orig/Makefile.in libssh-0.2/Makefile.in +--- libssh-0.2.orig/Makefile.in 2006-12-29 16:03:59.000000000 +0100 ++++ libssh-0.2/Makefile.in 2007-02-07 13:07:45.000000000 +0100 +@@ -82,13 +82,13 @@ + || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(incldir)/libssh +- $(INSTALL) include/libssh/libssh.h $(DESTDIR)$(incldir)/libssh/ +- $(INSTALL) include/libssh/config.h $(DESTDIR)$(incldir)/libssh/ +- $(INSTALL) include/libssh/sftp.h $(DESTDIR)$(incldir)/libssh/ +- $(INSTALL) include/libssh/crypto.h $(DESTDIR)$(incldir)/libssh/ +- $(INSTALL) include/libssh/server.h $(DESTDIR)$(incldir)/libssh/ +- $(INSTALL) include/libssh/ssh2.h $(DESTDIR)$(incldir)/libssh/ +- $(INSTALL) include/libssh/ssh1.h $(DESTDIR)$(incldir)/libssh/ ++ $(INSTALL) -m644 include/libssh/libssh.h $(DESTDIR)$(incldir)/libssh/ ++ $(INSTALL) -m644 include/libssh/config.h $(DESTDIR)$(incldir)/libssh/ ++ $(INSTALL) -m644 include/libssh/sftp.h $(DESTDIR)$(incldir)/libssh/ ++ $(INSTALL) -m644 include/libssh/crypto.h $(DESTDIR)$(incldir)/libssh/ ++ $(INSTALL) -m644 include/libssh/server.h $(DESTDIR)$(incldir)/libssh/ ++ $(INSTALL) -m644 include/libssh/ssh2.h $(DESTDIR)$(incldir)/libssh/ ++ $(INSTALL) -m644 include/libssh/ssh1.h $(DESTDIR)$(incldir)/libssh/ + + .PHONY: install-doc + install-doc: doc diff --git a/source/lib-extra/libssh/libssh-0.2-smp.diff b/source/lib-extra/libssh/libssh-0.2-smp.diff new file mode 100644 index 0000000..9d5d67f --- /dev/null +++ b/source/lib-extra/libssh/libssh-0.2-smp.diff @@ -0,0 +1,18 @@ +--- libssh-0.2/Makefile.in.orig 2006-12-29 16:03:59.000000000 +0100 ++++ libssh-0.2/Makefile.in 2007-02-07 13:18:11.000000000 +0100 +@@ -40,12 +40,14 @@ + % : %.o + $(LIBTOOL) --mode=link $(CC) -o $@ $< $(LDFLAGS) $(LIBS) + +-samplessh: sample.o ++samplessh: sample.o SUBDIRS + $(LIBTOOL) --mode=link $(CC) -o $@ $< $(LDFLAGS) $(LIBS) + + samplesftp: samplessh + $(LN) -f samplessh samplesftp + ++samplesshd: SUBDIRS ++ + $(CONFIG): + $(LN) -f ../../config.h $(CONFIG) + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
