diff --git a/Makefile b/Makefile index ce90f04..be5a074 100644 --- a/Makefile +++ b/Makefile @@ -12,10 +12,11 @@ export SRCPKG = gnutls export DEPENDS = glibc,gmp,libgcc,libgnutls,libnettle,libstdc++,zlib export ARCH = x86_64 export URL = http://www.gnutls.org/ +REPO = main BRIEF = Secure communications library DESC = GnuTLS is a secure communications library implementing the SSL, TLS \ and DTLS protocols and technologies around them. -SNAPVER = 2 +SNAPVER = 0 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') @@ -56,6 +57,7 @@ $(SRCDIR)/config.log: $(SRCDIR)/configure --prefix=/usr \ --with-default-trust-store-dir=/etc/ssl/certs \ --with-default-trust-store-file=/etc/ssl/certs/ca-bundle.crt \ + --without-p11-kit \ --build=x86_64-snap-linux-gnu \ --host=x86_64-snap-linux-gnu \ --target=x86_64-snap-linux-gnu @@ -70,7 +72,9 @@ $(ROOT): $(SRCDIR)/src/.libs/lt-danetool mkdir -v $(ROOT); \ fi - @cd $(SRCDIR) && make install DESTDIR=$(ROOT) + @cd $(SRCDIR) && make install DESTDIR=$(ROOT) && \ + rm -v $(ROOT)/usr/share/info/dir && \ + rm -v $(ROOT)/usr/share/info/*.png @install -v -d $(LIB)/SNAP && \ install -v -d $(LIBROOT)/usr/lib && \ diff --git a/Makefile.gnutls-dev b/Makefile.gnutls-dev index 5118ba0..db43166 100644 --- a/Makefile.gnutls-dev +++ b/Makefile.gnutls-dev @@ -8,7 +8,8 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -DEPENDS = gnutls +DEPENDS = gnutls=$(VERSION) +REPO = dev BRIEF = Development files for gnutls DESC = Development files for gnutls diff --git a/Makefile.libgnutls b/Makefile.libgnutls index dc99c3f..019aad6 100644 --- a/Makefile.libgnutls +++ b/Makefile.libgnutls @@ -8,7 +8,8 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -DEPENDS = glibc,gmp,libgcc,libstdc++,nettle,zlib +DEPENDS = glibc,gmp,gnutls=$(VERSION),libgcc,libstdc++,nettle,zlib +REPO = main BRIEF = Runtime library for gnutls DESC = Runtime library for gnutls diff --git a/SRC/gnutls-3.3.27.tar.xz b/SRC/gnutls-3.3.27.tar.xz new file mode 100644 index 0000000..9fb2519 Binary files /dev/null and b/SRC/gnutls-3.3.27.tar.xz differ diff --git a/SRC/gnutls-3.3.27.tar.xz.sig b/SRC/gnutls-3.3.27.tar.xz.sig new file mode 100644 index 0000000..388a7e6 Binary files /dev/null and b/SRC/gnutls-3.3.27.tar.xz.sig differ diff --git a/SRC/gnutls-3.3.9.tar.xz b/SRC/gnutls-3.3.9.tar.xz deleted file mode 100644 index a59a41e..0000000 Binary files a/SRC/gnutls-3.3.9.tar.xz and /dev/null differ diff --git a/SRC/gnutls-3.3.9.tar.xz.sig b/SRC/gnutls-3.3.9.tar.xz.sig deleted file mode 100644 index 0775694..0000000 Binary files a/SRC/gnutls-3.3.9.tar.xz.sig and /dev/null differ