From 58e38c5148fc092048ffeada642d9356214e0034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Mon, 13 Jul 2015 14:24:05 +0300 Subject: [PATCH 1/3] gnutls and deps fix deps. --- util/crypt/gnutls/actions.py | 39 +++++ util/crypt/gnutls/files/libgnutls-config | 91 ++++++++++ util/crypt/gnutls/pspec.xml | 183 +++++++++++++++++++++ util/crypt/gnutls/translations.xml | 30 ++++ util/crypt/libtasn1/actions.py | 32 ++++ util/crypt/libtasn1/files/libgnutls-config | 91 ++++++++++ util/crypt/libtasn1/pspec.xml | 118 +++++++++++++ util/crypt/libtasn1/translations.xml | 18 ++ util/crypt/p11-kit/actions.py | 22 +++ util/crypt/p11-kit/pspec.xml | 138 ++++++++++++++++ util/crypt/p11-kit/translations.xml | 16 ++ 11 files changed, 778 insertions(+) create mode 100644 util/crypt/gnutls/actions.py create mode 100644 util/crypt/gnutls/files/libgnutls-config create mode 100644 util/crypt/gnutls/pspec.xml create mode 100644 util/crypt/gnutls/translations.xml create mode 100644 util/crypt/libtasn1/actions.py create mode 100644 util/crypt/libtasn1/files/libgnutls-config create mode 100644 util/crypt/libtasn1/pspec.xml create mode 100644 util/crypt/libtasn1/translations.xml create mode 100644 util/crypt/p11-kit/actions.py create mode 100644 util/crypt/p11-kit/pspec.xml create mode 100644 util/crypt/p11-kit/translations.xml diff --git a/util/crypt/gnutls/actions.py b/util/crypt/gnutls/actions.py new file mode 100644 index 0000000000..549c18c256 --- /dev/null +++ b/util/crypt/gnutls/actions.py @@ -0,0 +1,39 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import get +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools + +def setup(): + options = "--disable-static \ + --disable-rpath \ + --disable-silent-rules \ + --disable-guile \ + --enable-heartbeat-support \ + --with-zlib \ + --without-tpm \ + --disable-valgrind-tests" + + if get.buildTYPE() == "emul32": + options += " --disable-hardware-acceleration \ + --enable-local-libopts \ + " + + autotools.configure(options) + + pisitools.dosed("libtool", " -shared ", " -Wl,--as-needed -shared ") + +def build(): + autotools.make() + +def check(): + #some tests fail in emul32 + if not get.buildTYPE() == "emul32": + autotools.make("-k check") + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) diff --git a/util/crypt/gnutls/files/libgnutls-config b/util/crypt/gnutls/files/libgnutls-config new file mode 100644 index 0000000000..8970bf4de8 --- /dev/null +++ b/util/crypt/gnutls/files/libgnutls-config @@ -0,0 +1,91 @@ +#!/bin/sh + +prefix=/usr +exec_prefix=/usr +exec_prefix_set=no + +name=`basename $0` +name=${name#lib} +name=${name%-config} + +libs=`pkg-config --libs $name` +cflags=`pkg-config --cflags $name` +version=`pkg-config --modversion $name` + +usage() +{ + +echo Usage: lib$name-config [OPTIONS] + cat <&2 +fi + +while test $# -gt 0; do + case "$1" in + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + + case $1 in + --prefix=*) + prefix=$optarg + if test $exec_prefix_set = no ; then + exec_prefix=$optarg + fi + ;; + --prefix) + echo_prefix=yes + ;; + --exec-prefix=*) + exec_prefix=$optarg + exec_prefix_set=yes + ;; + --exec-prefix) + echo_exec_prefix=yes + ;; + --version) + echo $version + exit 0 + ;; + --cflags) + echo_cflags=yes + ;; + --libs) + echo_libs=yes + ;; + --help) + usage 0 + ;; + *) + usage 1 1>&2 + ;; + esac + shift +done + +if test "$echo_prefix" = "yes"; then + echo $prefix +fi + +if test "$echo_exec_prefix" = "yes"; then + echo $exec_prefix +fi + +if test "$echo_cflags" = "yes"; then + echo $cflags +fi + +if test "$echo_libs" = "yes"; then + echo $libs +fi diff --git a/util/crypt/gnutls/pspec.xml b/util/crypt/gnutls/pspec.xml new file mode 100644 index 0000000000..d82d61976a --- /dev/null +++ b/util/crypt/gnutls/pspec.xml @@ -0,0 +1,183 @@ + + + + + gnutls + http://www.gnutls.org + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + library + GNU TLS Library + gnutls is a project that aims to develop a library which provides a secure layer, over a reliable transport layer. Currently the GnuTLS library implements the proposed standards by the IETF's TLS working group. + http://mirror.tje.me.uk/pub/mirrors/ftp.gnupg.org/gnutls/v3.3/gnutls-3.3.16.tar.xz + + gc-devel + gmp-devel + nettle-devel + autogen-devel + p11-kit-devel + libidn-devel + zlib-devel + libtasn1-devel + + + + + gnutls + + zlib + libidn + gmp + nettle + autogen + p11-kit + libgcc + libtasn1 + + + /usr/share + /usr/lib + /usr/bin + + + + + gnutls-devel + Development files for gnutls + + nettle-devel + p11-kit-devel + libtasn1-devel + gnutls + + + /usr/include + /usr/share/man/man3 + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + /usr/share/info/gnutls* + /usr/bin/libgnutls*-config + + + libgnutls-config + libgnutls-config + + + + + gnutls-32bit + emul32 + 32-bit shared libraries for gnutls + emul32 + + gmp-32bit + zlib-32bit + libidn-32bit + nettle-32bit + p11-kit-32bit + libtasn1-32bit + + + libgcc + glibc-32bit + gmp-32bit + zlib-32bit + nettle-32bit + p11-kit-32bit + libtasn1-32bit + + + /usr/lib32 + + + + + + 2015-07-13 + 3.3.16 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2015-05-20 + 3.3.15 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-12-13 + 3.3.11 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-07-06 + 3.3.5 + Version bump and security update(CVE-2014-3466) + Vedat Demir + vedat@pisilinux.org + + + 2014-05-24 + 3.3.2 + Rebuild for gcc. + PisiLinux Community + admins@pisilinux.org + + + 2014-05-21 + 3.3.2 + Version bump, rm unneed deps. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-04-20 + 3.3.1 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-01-06 + 3.2.5 + Rebuild to fix stripping. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-10-27 + 3.2.5 + Version bump, clean up, enable tests. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-07-30 + 3.1.9 + Rebuild + PisiLinux Community + admins@pisilinux.org + + + 2013-03-04 + 3.1.9 + Version bump + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2012-11-02 + 3.1.3 + First release + Marcin Bojara + marcin@pisilinux.org + + + diff --git a/util/crypt/gnutls/translations.xml b/util/crypt/gnutls/translations.xml new file mode 100644 index 0000000000..82138c8c89 --- /dev/null +++ b/util/crypt/gnutls/translations.xml @@ -0,0 +1,30 @@ + + + + gnutls + GNU TLS Kütüphanesi + Biblioteka GNU TLS (Transport Layer Security) + GnuTLS, erişilebilir bir gönderim katmanı üzerinde güvenli katman oluşturmayı amaçlayan bir projedir. GnuTLS kütüphanesi halen IETF TLS çalışma grubunun öngördüğü standartları uygulamaya geçirmektedir. + GnuTLS est un projet dont l'objectif est de développer une librairie fournissant une couche de sécurité au dessus d'une couche de transport fiable. Actuellement la librairie GnuTLS implémente les standards proposés par le groupe de travail TLs de l'IETF. + GnuTLS es un proyecto que apunta al desarrollo de una librería, que facilite una capa segura, a través de una capa de transporte fiable. Actualmente la librería GnuTLS implementa los estándares propuestos del grupo de trabajo de TLS de IETF. + GnuTLS to projekt mający na celu stworzenie biblioteki udostępniającej powłokę bezpieczeństwa ponad powłoką transportową (np. TCP/IP). Aktualnie biblioteka gnuTLS implementuje standardy proponowane przez grupę roboczą IETF TLS. + + + + gnutls-guile + gnutls için guile bağlayıcıları + Wiązania Guile do GnuTLS. + + + + gnutls-devel + gnutls için geliştirme dosyaları + Pliki nagłówkowe do gnutls. + + + + gnutls-32bit + gnutls için 32-bit paylaşımlı kitaplıklar + 32-bitowe biblioteki GnuTLS. + + diff --git a/util/crypt/libtasn1/actions.py b/util/crypt/libtasn1/actions.py new file mode 100644 index 0000000000..1f294ed102 --- /dev/null +++ b/util/crypt/libtasn1/actions.py @@ -0,0 +1,32 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import get +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools + +def setup(): + options = "--disable-static" + + if not get.buildTYPE() == "emul32": + options += " --libdir=/usr/lib" + + autotools.configure(options) + + #pisitools.dosed("libtool", "^sys_lib_dlsearch_path_spec=.*", "sys_lib_dlsearch_path_spec=\"/%{_lib} %{_libdir} \"") + +def build(): + autotools.make() + +def check(): + autotools.make("check") + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + if get.buildTYPE() == "emul32": return + + pisitools.dodoc("ChangeLog", "README", "NEWS", "AUTHORS", "COPYING") diff --git a/util/crypt/libtasn1/files/libgnutls-config b/util/crypt/libtasn1/files/libgnutls-config new file mode 100644 index 0000000000..167bc483d5 --- /dev/null +++ b/util/crypt/libtasn1/files/libgnutls-config @@ -0,0 +1,91 @@ +#!/bin/sh + +prefix=/usr +exec_prefix=/usr +exec_prefix_set=no + +name=`basename $0` +name=${name#lib} +name=${name%-config} + +libs=`pkg-config --libs $name` +cflags=`pkg-config --cflags $name` +version=`pkg-config --modversion $name` + +usage() +{ + +echo Usage: lib$name-config [OPTIONS] +cat <&2 +fi + +while test $# -gt 0; do + case "$1" in + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + + case $1 in + --prefix=*) + prefix=$optarg + if test $exec_prefix_set = no ; then +exec_prefix=$optarg + fi + ;; + --prefix) + echo_prefix=yes + ;; + --exec-prefix=*) + exec_prefix=$optarg + exec_prefix_set=yes + ;; + --exec-prefix) + echo_exec_prefix=yes + ;; + --version) + echo $version + exit 0 + ;; + --cflags) + echo_cflags=yes + ;; + --libs) + echo_libs=yes + ;; + --help) + usage 0 + ;; + *) + usage 1 1>&2 + ;; + esac + shift +done + +if test "$echo_prefix" = "yes"; then + echo $prefix +fi + +if test "$echo_exec_prefix" = "yes"; then + echo $exec_prefix +fi + +if test "$echo_cflags" = "yes"; then + echo $cflags +fi + +if test "$echo_libs" = "yes"; then + echo $libs +fi \ No newline at end of file diff --git a/util/crypt/libtasn1/pspec.xml b/util/crypt/libtasn1/pspec.xml new file mode 100644 index 0000000000..878ace5a76 --- /dev/null +++ b/util/crypt/libtasn1/pspec.xml @@ -0,0 +1,118 @@ + + + + + libtasn1 + http://www.gnutls.org/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + library + ASN.1 library used in GNUTLS + libtasn1 is the ASN.1 library which provides ASN.1 structures parsing capabilities for use with GNUTLS. + http://ftp.gnu.org/gnu/libtasn1/libtasn1-4.5.tar.gz + + + + libtasn1 + + /usr/share + /usr/lib + /usr/share/man + /usr/share/doc + /usr/bin + + + + + libtasn1-devel + Development files for libtasn1 + + libtasn1 + + + /usr/include + /usr/share/man/man3 + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + + + + + libtasn1-32bit + emul32 + 32-bit shared libraries for libtasn1 + emul32 + + glibc-32bit + + + libtasn1 + glibc-32bit + + + /usr/lib32/ + + + + + + 2015-07-13 + 4.5 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2015-04-28 + 4.4 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-10-31 + 4.2 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-05-24 + 3.5 + Version bump. + PisiLinux Community + admins@pisilinux.org + + + 2014-04-20 + 3.4 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-09 + 3.3 + Rebuild. + Kamil Atlı + suvarice@gmail.com + + + 2013-07-27 + 3.3 + Move pc files to devel pack, rebuild + v.bump + PisiLinux Community + admins@pisilinux.org + + + 2012-10-18 + 2.14 + First release + PisiLinux Community + admins@pisilinux.org + + + diff --git a/util/crypt/libtasn1/translations.xml b/util/crypt/libtasn1/translations.xml new file mode 100644 index 0000000000..da660e3c43 --- /dev/null +++ b/util/crypt/libtasn1/translations.xml @@ -0,0 +1,18 @@ + + + + libtasn1 + GNUTLS için kullanılan ASN.1 kütüphanesi + libtasn1, ASN.1 yapılarının ayrıştırılmasını sağlayan ve GNUTLS içerisinde kullanılan ASN.1 kütüphanesidir. + + + + libtasn1-devel + libtasn1 için geliştirme dosyaları + + + + libtasn1-32bit + libtasn1 için 32bit kütüphanesi + + \ No newline at end of file diff --git a/util/crypt/p11-kit/actions.py b/util/crypt/p11-kit/actions.py new file mode 100644 index 0000000000..b5d24041f4 --- /dev/null +++ b/util/crypt/p11-kit/actions.py @@ -0,0 +1,22 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import get +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools + +def setup(): + autotools.configure("--with-module-path=/usr/lib%s/pkcs11" % ("32" if get.buildTYPE() == "emul32" else "")) + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + if get.buildTYPE() == "emul32": return + + pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "README") diff --git a/util/crypt/p11-kit/pspec.xml b/util/crypt/p11-kit/pspec.xml new file mode 100644 index 0000000000..e1594e058d --- /dev/null +++ b/util/crypt/p11-kit/pspec.xml @@ -0,0 +1,138 @@ + + + + + p11-kit + http://p11-glue.freedesktop.org/ + + PisiLinux Community + admins@pisilinux.org + + BSD + library + util.crypt + Library to work with PKCS#11 modules + The p11-kit package Provides a way to load and enumerate PKCS #11 (a Cryptographic Token Interface Standard) modules. + http://p11-glue.freedesktop.org/releases/p11-kit-0.23.1.tar.gz + + libtasn1-devel + libffi-devel + + + + + p11-kit + + libtasn1 + libffi + + + /usr/bin + /usr/share/doc + /usr/share/gtk-doc + /usr/share/p11-kit + /usr/lib + /etc/pkcs11 + + + + + p11-kit-devel + p11-kit için geliştirme dosyaları + + p11-kit + + + /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + + + + + p11-kit-32bit + emul32 + 32-bit shared libraries for p11-kit + emul32 + + libtasn1-32bit + libffi-32bit + glibc-32bit + + + p11-kit + libffi-32bit + libtasn1-32bit + glibc-32bit + + + /usr/lib32 + + + + + + 2015-04-28 + 0.23.1 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-12-13 + 0.22.1 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-05-24 + 0.20.2 + Rebuild for gcc. + PisiLinux Community + admins@pisilinux.org + + + 2014-04-20 + 0.20.2 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-26 + 0.20.1 + Version bump + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-07-31 + 0.19.3 + version bump + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + 2013-07-26 + 0.15.2 + Move pc files to devel pack,rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-02-23 + 0.15.2 + Version bump + Ertan Güven + ertan@pisilinux.org + + + 2012-11-02 + 0.14 + First release + Marcin Bojara + marcin@pisilinux.org + + + diff --git a/util/crypt/p11-kit/translations.xml b/util/crypt/p11-kit/translations.xml new file mode 100644 index 0000000000..c93b170330 --- /dev/null +++ b/util/crypt/p11-kit/translations.xml @@ -0,0 +1,16 @@ + + + + p11-kit + Library to work with PKCS#11 modules + Biblioteka i moduł proxy do właściwego wczytywania i współdzielenia modułów PKCS #11 + The p11-kit package Provides a way to load and enumerate PKCS #11 (a Cryptographic Token Interface Standard) modules. + p11-kit zapewnia możliwość ładowania i numeracji modułów PKCS #11 (a Cryptographic Token Interface Standard). + + + + p11-kit-devel + p11-kit için geliştirme dosyaları. + Pliki nagłówkowe do biplioteki p11-kit. + + From 0a5bc79cc4324e9f18b4f1b0854883b05d24f966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Mon, 13 Jul 2015 15:15:56 +0300 Subject: [PATCH 2/3] libsoup, glib-networking and gnutls fix deps. --- network/library/component.xml | 3 + network/library/glib-networking/actions.py | 27 +++++++++ network/library/glib-networking/pspec.xml | 57 +++++++++++++++++++ .../library/glib-networking/translations.xml | 8 +++ programming/misc/libsoup/actions.py | 6 +- programming/misc/libsoup/pspec.xml | 15 ++--- util/crypt/gnutls/pspec.xml | 1 + 7 files changed, 106 insertions(+), 11 deletions(-) create mode 100644 network/library/component.xml create mode 100644 network/library/glib-networking/actions.py create mode 100644 network/library/glib-networking/pspec.xml create mode 100644 network/library/glib-networking/translations.xml diff --git a/network/library/component.xml b/network/library/component.xml new file mode 100644 index 0000000000..4e017e10ad --- /dev/null +++ b/network/library/component.xml @@ -0,0 +1,3 @@ + + network.library + diff --git a/network/library/glib-networking/actions.py b/network/library/glib-networking/actions.py new file mode 100644 index 0000000000..43ba527a00 --- /dev/null +++ b/network/library/glib-networking/actions.py @@ -0,0 +1,27 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/copyleft/gpl.txt + +from pisi.actionsapi import get +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools + +def setup(): + autotools.configure("--disable-static \ + --disable-installed-tests \ + --with-ca-certificates=/etc/ssl/certs/ca-certificates.crt \ + --without-libproxy \ + --with-gnutls \ + --with-pkcs11") + +def build(): + autotools.make() + +def check(): + autotools.make("check") + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "NEWS", "README") \ No newline at end of file diff --git a/network/library/glib-networking/pspec.xml b/network/library/glib-networking/pspec.xml new file mode 100644 index 0000000000..45b5cef2b5 --- /dev/null +++ b/network/library/glib-networking/pspec.xml @@ -0,0 +1,57 @@ + + + + + glib-networking + http://git.gnome.org/browse/glib-networking/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2+ + library + Network-related giomodules for glib + This package contains various network related extensions for the GIO library. + mirrors://gnome/glib-networking/2.38/glib-networking-2.38.2.tar.xz + + gnutls-devel + p11-kit-devel + ca-certificates + intltool + glib2-devel + + + + + glib-networking + + gnutls + p11-kit + glib2 + ca-certificates + + + /usr/lib/gio/modules + /usr/libexec + /usr/share + /usr/share/doc/glib-networking + + + + + + 2014-03-30 + 2.38.2 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-01-27 + 2.34.2 + First release. + Marcin Bojara + marcin@pisilinux.org + + + diff --git a/network/library/glib-networking/translations.xml b/network/library/glib-networking/translations.xml new file mode 100644 index 0000000000..a366fdd11f --- /dev/null +++ b/network/library/glib-networking/translations.xml @@ -0,0 +1,8 @@ + + + + glib-networking + Moduły GIO dotyczące sieci do glib + Pakiet zawiera różne rozszerzenia dotyczące sieci do biblioteki GIO. + + diff --git a/programming/misc/libsoup/actions.py b/programming/misc/libsoup/actions.py index a0f37d9448..2d5a212166 100644 --- a/programming/misc/libsoup/actions.py +++ b/programming/misc/libsoup/actions.py @@ -14,12 +14,14 @@ def setup(): --disable-static \ --without-apache-httpd \ --without-apache-module-dir \ + --disable-tls-check \ " + if get.buildTYPE() == "_emul32": options += " --libdir=/usr/lib32 \ --bindir=/_emul32/bin \ - --sbindir=/_emul32/sbin \ - --disable-tls-check" + --sbindir=/_emul32/sbin" + shelltools.export("CC", "%s -m32" % get.CC()) shelltools.export("CXX", "%s -m32" % get.CXX()) diff --git a/programming/misc/libsoup/pspec.xml b/programming/misc/libsoup/pspec.xml index 5b571fcf38..e593e023f0 100644 --- a/programming/misc/libsoup/pspec.xml +++ b/programming/misc/libsoup/pspec.xml @@ -14,19 +14,14 @@ libsoup is an HTTP client/server library for GNOME. mirrors://gnome/libsoup/2.50/libsoup-2.50.0.tar.xz - gtk-doc - tls-devel - gconf-devel - gnutls-devel - glib-networking libgcrypt-devel - libgnome-keyring-devel + gtk-doc glib2-devel libxml2-devel sqlite-devel - - - + intltool + gettext-devel + @@ -35,6 +30,7 @@ glib2 libxml2 sqlite + glib-networking /usr/lib @@ -47,6 +43,7 @@ libsoup-gnome + glib2 libsoup diff --git a/util/crypt/gnutls/pspec.xml b/util/crypt/gnutls/pspec.xml index d82d61976a..a7bbc66ed3 100644 --- a/util/crypt/gnutls/pspec.xml +++ b/util/crypt/gnutls/pspec.xml @@ -51,6 +51,7 @@ nettle-devel p11-kit-devel libtasn1-devel + zlib-devel gnutls From e2b0e4e10924ad9b212341239e15383683837cdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Mon, 13 Jul 2015 15:49:06 +0300 Subject: [PATCH 3/3] nano moved here. --- editor/component.xml | 3 + editor/nano/actions.py | 25 +++ ...0001-nanorc-default-settings-changes.patch | 173 ++++++++++++++++++ ...ult-and-avoid-calling-stat-on-a-NULL.patch | 77 ++++++++ ...timens-if-available-instead-of-utime.patch | 128 +++++++++++++ .../files/fedora/nano-2.3.0-warnings.patch | 42 +++++ editor/nano/pspec.xml | 77 ++++++++ editor/nano/translations.xml | 9 + 8 files changed, 534 insertions(+) create mode 100644 editor/component.xml create mode 100644 editor/nano/actions.py create mode 100644 editor/nano/files/0001-nanorc-default-settings-changes.patch create mode 100644 editor/nano/files/fedora/0001-check-stat-s-result-and-avoid-calling-stat-on-a-NULL.patch create mode 100644 editor/nano/files/fedora/0002-use-futimens-if-available-instead-of-utime.patch create mode 100644 editor/nano/files/fedora/nano-2.3.0-warnings.patch create mode 100644 editor/nano/pspec.xml create mode 100644 editor/nano/translations.xml diff --git a/editor/component.xml b/editor/component.xml new file mode 100644 index 0000000000..84a47fb070 --- /dev/null +++ b/editor/component.xml @@ -0,0 +1,3 @@ + + editor + diff --git a/editor/nano/actions.py b/editor/nano/actions.py new file mode 100644 index 0000000000..49e400a34c --- /dev/null +++ b/editor/nano/actions.py @@ -0,0 +1,25 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import get + +def setup(): + autotools.autoreconf("-fvi") + autotools.configure("--disable-rpath \ + --enable-utf8 \ + --enable-altrcname \ + --disable-speller") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.insinto("/etc/", "doc/nanorc.sample", "nanorc") + pisitools.dosym("/usr/bin/nano", "/bin/nano") + + pisitools.dohtml("doc/*.html") + pisitools.dodoc("ChangeLog*", "README", "doc/nanorc.sample", "AUTHORS", "NEWS", "TODO", "COPYING*", "THANKS", "UPGRADE") diff --git a/editor/nano/files/0001-nanorc-default-settings-changes.patch b/editor/nano/files/0001-nanorc-default-settings-changes.patch new file mode 100644 index 0000000000..d72750a939 --- /dev/null +++ b/editor/nano/files/0001-nanorc-default-settings-changes.patch @@ -0,0 +1,173 @@ +From ffb42bb0d87586adac14144b98333eb52808ce99 Mon Sep 17 00:00:00 2001 +From: Mehmet Emre Atasever +Date: Sun, 26 Jun 2011 18:39:04 +0300 +Subject: [PATCH] nanorc default settings changes + +Some default settings are not so convenient for Pisi Linux nano users. + +also fixes bugs (#pb18483, #pb18484) +--- + doc/nanorc.sample.in | 64 +++++++++++++++++++++++++------------------------- + 1 files changed, 32 insertions(+), 32 deletions(-) + +diff --git a/doc/nanorc.sample.in b/doc/nanorc.sample.in +index f164c26..24d3c7b 100644 +--- a/doc/nanorc.sample.in ++++ b/doc/nanorc.sample.in +@@ -25,17 +25,17 @@ + # set backupdir "" + + ## Do backwards searches by default. +-# set backwards ++set backwards + + ## Use bold text instead of reverse video text. +-# set boldtext ++set boldtext + + ## The characters treated as closing brackets when justifying + ## paragraphs. They cannot contain blank characters. Only closing + ## punctuation, optionally followed by closing brackets, can end + ## sentences. + ## +-# set brackets ""')>]}" ++set brackets ""')>]}" + + ## Do case sensitive searches by default. + # set casesensitive +@@ -60,7 +60,7 @@ + ## searches. They cannot contain blank characters. The former set must + ## come before the latter set, and both must be in the same order. + ## +-# set matchbrackets "(<[{)>]}" ++set matchbrackets "(<[{)>]}" + + ## Use the blank line below the titlebar as extra editing space. + # set morespace +@@ -139,7 +139,7 @@ + # set smarthome + + ## Use smooth scrolling as the default. +-# set smooth ++set smooth + + ## Enable soft line wrapping (AKA full line display). + # set softwrap +@@ -153,7 +153,7 @@ + # set suspend + + ## Use this tab size instead of the default; it must be greater than 0. +-# set tabsize 8 ++set tabsize 4 + + ## Convert typed tabs to spaces. + # set tabstospaces +@@ -234,79 +234,79 @@ + + + ## Nanorc files +-# include "@PKGDATADIR@/nanorc.nanorc" ++include "@PKGDATADIR@/nanorc.nanorc" + + ## C/C++ +-# include "@PKGDATADIR@/c.nanorc" ++include "@PKGDATADIR@/c.nanorc" + + ## Makefiles +-# include "@PKGDATADIR@/makefile.nanorc" ++include "@PKGDATADIR@/makefile.nanorc" + + ## Cascading Style Sheets +-# include "@PKGDATADIR@/css.nanorc" ++include "@PKGDATADIR@/css.nanorc" + + ## Debian files +-# include "@PKGDATADIR@/debian.nanorc" ++include "@PKGDATADIR@/debian.nanorc" + + ## Gentoo files +-# include "@PKGDATADIR@/gentoo.nanorc" ++include "@PKGDATADIR@/gentoo.nanorc" + + ## HTML +-# include "@PKGDATADIR@/html.nanorc" ++include "@PKGDATADIR@/html.nanorc" + + ## PHP +-# include "@PKGDATADIR@/php.nanorc" ++include "@PKGDATADIR@/php.nanorc" + + ## TCL +-# include "@PKGDATADIR@/tcl.nanorc" ++include "@PKGDATADIR@/tcl.nanorc" + + ## TeX +-# include "@PKGDATADIR@/tex.nanorc" ++include "@PKGDATADIR@/tex.nanorc" + + ## Quoted emails (under e.g. mutt) +-# include "@PKGDATADIR@/mutt.nanorc" ++include "@PKGDATADIR@/mutt.nanorc" + + ## Patch files +-# include "@PKGDATADIR@/patch.nanorc" ++include "@PKGDATADIR@/patch.nanorc" + + ## Manpages +-# include "@PKGDATADIR@/man.nanorc" ++include "@PKGDATADIR@/man.nanorc" + + ## Groff +-# include "@PKGDATADIR@/groff.nanorc" ++include "@PKGDATADIR@/groff.nanorc" + + ## Perl +-# include "@PKGDATADIR@/perl.nanorc" ++include "@PKGDATADIR@/perl.nanorc" + + ## Python +-# include "@PKGDATADIR@/python.nanorc" ++include "@PKGDATADIR@/python.nanorc" + + ## Ruby +-# include "@PKGDATADIR@/ruby.nanorc" ++include "@PKGDATADIR@/ruby.nanorc" + + ## Java +-# include "@PKGDATADIR@/java.nanorc" ++include "@PKGDATADIR@/java.nanorc" + + ## Fortran +-# include "@PKGDATADIR@/fortran.nanorc" ++include "@PKGDATADIR@/fortran.nanorc" + + ## Objective-C +-# include "@PKGDATADIR@/objc.nanorc" ++include "@PKGDATADIR@/objc.nanorc" + + ## OCaml +-# include "@PKGDATADIR@/ocaml.nanorc" ++include "@PKGDATADIR@/ocaml.nanorc" + + ## AWK +-# include "@PKGDATADIR@/awk.nanorc" ++include "@PKGDATADIR@/awk.nanorc" + + ## Assembler +-# include "@PKGDATADIR@/asm.nanorc" ++include "@PKGDATADIR@/asm.nanorc" + + ## Bourne shell scripts +-# include "@PKGDATADIR@/sh.nanorc" ++include "@PKGDATADIR@/sh.nanorc" + + ## POV-Ray +-# include "@PKGDATADIR@/pov.nanorc" ++include "@PKGDATADIR@/pov.nanorc" + + ## XML-type files +-# include "@PKGDATADIR@/xml.nanorc" ++include "@PKGDATADIR@/xml.nanorc" +-- +1.7.5.4 + diff --git a/editor/nano/files/fedora/0001-check-stat-s-result-and-avoid-calling-stat-on-a-NULL.patch b/editor/nano/files/fedora/0001-check-stat-s-result-and-avoid-calling-stat-on-a-NULL.patch new file mode 100644 index 0000000000..739f6f5d2f --- /dev/null +++ b/editor/nano/files/fedora/0001-check-stat-s-result-and-avoid-calling-stat-on-a-NULL.patch @@ -0,0 +1,77 @@ +From fc87b0a32c130a2b3ab37e614d4a1c6c8e5d70e7 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka +Date: Thu, 19 Aug 2010 13:58:12 +0200 +Subject: [PATCH 1/2] check stat's result and avoid calling stat on a NULL pointer + +--- + src/files.c | 33 +++++++++++++++++++++++++-------- + 1 files changed, 25 insertions(+), 8 deletions(-) + +diff --git a/src/files.c b/src/files.c +index f6efbf1..99cc1b8 100644 +--- a/src/files.c ++++ b/src/files.c +@@ -103,6 +103,24 @@ void initialize_buffer_text(void) + openfile->totsize = 0; + } + ++#ifndef NANO_TINY ++/* If *pstat is NULL, perform a stat call with the given file name. On success, ++ * *pstat points to a newly allocated buffer that contains the stat's result. ++ * On stat's failure, the NULL pointer in *pstat is left intact. */ ++void stat_if_needed(const char *filename, struct stat **pstat) ++{ ++ struct stat *tmp; ++ if (*pstat) ++ return; ++ ++ tmp = (struct stat *)nmalloc(sizeof(struct stat)); ++ if (0 == stat(filename, tmp)) ++ *pstat = tmp; ++ else ++ free(tmp); ++} ++#endif ++ + /* If it's not "", filename is a file to open. We make a new buffer, if + * necessary, and then open and read the file, if applicable. */ + void open_buffer(const char *filename, bool undoable) +@@ -148,11 +166,7 @@ void open_buffer(const char *filename, bool undoable) + if (rc > 0) { + read_file(f, rc, filename, undoable, new_buffer); + #ifndef NANO_TINY +- if (openfile->current_stat == NULL) { +- openfile->current_stat = +- (struct stat *)nmalloc(sizeof(struct stat)); +- stat(filename, openfile->current_stat); +- } ++ stat_if_needed(filename, &openfile->current_stat); + #endif + } + +@@ -1532,8 +1546,8 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type + * specified it interactively), stat and save the value + * or else we will chase null pointers when we do + * modtime checks, preserve file times, etc. during backup */ +- if (openfile->current_stat == NULL && !tmp && realexists) +- stat(realname, openfile->current_stat); ++ if (!tmp && realexists) ++ stat_if_needed(realname, &openfile->current_stat); + + /* We backup only if the backup toggle is set, the file isn't + * temporary, and the file already exists. Furthermore, if we +@@ -1924,7 +1938,10 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type + if (openfile->current_stat == NULL) + openfile->current_stat = + (struct stat *)nmalloc(sizeof(struct stat)); +- stat(realname, openfile->current_stat); ++ if (stat(realname, openfile->current_stat)) { ++ free(openfile->current_stat); ++ openfile->current_stat = NULL; ++ } + #endif + + statusbar(P_("Wrote %lu line", "Wrote %lu lines", +-- +1.7.4 + diff --git a/editor/nano/files/fedora/0002-use-futimens-if-available-instead-of-utime.patch b/editor/nano/files/fedora/0002-use-futimens-if-available-instead-of-utime.patch new file mode 100644 index 0000000000..d2a687fb24 --- /dev/null +++ b/editor/nano/files/fedora/0002-use-futimens-if-available-instead-of-utime.patch @@ -0,0 +1,128 @@ +From 23510b930ea31f7de8005e2f0ff6cab7062b4e26 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka +Date: Thu, 19 Aug 2010 15:23:06 +0200 +Subject: [PATCH 2/2] use futimens() if available, instead of utime() + +--- + config.h.in | 3 +++ + configure | 2 +- + configure.ac | 2 +- + src/files.c | 48 +++++++++++++++++++++++++++++++++++------------- + 4 files changed, 40 insertions(+), 15 deletions(-) + +diff --git a/config.h.in b/config.h.in +index 52e13f1..cb17b29 100644 +--- a/config.h.in ++++ b/config.h.in +@@ -64,6 +64,9 @@ + /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ + #undef HAVE_DOPRNT + ++/* Define to 1 if you have the `futimens' function. */ ++#undef HAVE_FUTIMENS ++ + /* Define to 1 if you have the `getdelim' function. */ + #undef HAVE_GETDELIM + +diff --git a/configure b/configure +index 02733c7..1805e53 100755 +--- a/configure ++++ b/configure +@@ -7484,7 +7484,7 @@ fi + + + +-for ac_func in getdelim getline isblank strcasecmp strcasestr strncasecmp strnlen vsnprintf ++for ac_func in futimens getdelim getline isblank strcasecmp strcasestr strncasecmp strnlen vsnprintf + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +diff --git a/configure.ac b/configure.ac +index 66f8ee3..f4975d3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -415,7 +415,7 @@ fi]) + + dnl Checks for functions. + +-AC_CHECK_FUNCS(getdelim getline isblank strcasecmp strcasestr strncasecmp strnlen vsnprintf) ++AC_CHECK_FUNCS(futimens getdelim getline isblank strcasecmp strcasestr strncasecmp strnlen vsnprintf) + + if test x$enable_utf8 != xno; then + AC_CHECK_FUNCS(iswalnum iswblank iswpunct iswspace nl_langinfo mblen mbstowcs mbtowc wctomb wcwidth) +diff --git a/src/files.c b/src/files.c +index 99cc1b8..9a1bdcc 100644 +--- a/src/files.c ++++ b/src/files.c +@@ -1455,6 +1455,29 @@ int copy_file(FILE *inn, FILE *out) + return retval; + } + ++#ifdef HAVE_FUTIMENS ++/* set atime/mtime by file descriptor */ ++int utime_wrap(int fd, const char *filename, struct utimbuf *ut) ++{ ++ struct timespec times[2]; ++ (void) filename; ++ ++ times[0].tv_sec = ut->actime; ++ times[1].tv_sec = ut->modtime; ++ times[0].tv_nsec = 0L; ++ times[1].tv_nsec = 0L; ++ ++ return futimens(fd, times); ++} ++#else ++/* set atime/mtime by file name */ ++int utime_wrap(int fd, const char *filename, struct utimbuf *ut) ++{ ++ (void) fd; ++ return utime(filename, ut); ++} ++#endif ++ + /* Write a file out to disk. If f_open isn't NULL, we assume that it is + * a stream associated with the file, and we don't try to open it + * ourselves. If tmp is TRUE, we set the umask to disallow anyone else +@@ -1694,6 +1717,18 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type + fprintf(stderr, "Backing up %s to %s\n", realname, backupname); + #endif + ++ /* Set backup's file metadata. */ ++ if (utime_wrap(backup_fd, backupname, &filetime) == -1 ++ && !ISSET(INSECURE_BACKUP)) { ++ statusbar(_("Error writing backup file %s: %s"), backupname, ++ strerror(errno)); ++ /* If we can't write to the backup, DONT go on, since ++ whatever caused the backup file to fail (e.g. disk ++ full may well cause the real file write to fail, which ++ means we could lose both the backup and the original! */ ++ goto cleanup_and_exit; ++ } ++ + /* Copy the file. */ + copy_status = copy_file(f, backup_file); + +@@ -1704,19 +1739,6 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type + goto cleanup_and_exit; + } + +- /* And set its metadata. */ +- if (utime(backupname, &filetime) == -1 && !ISSET(INSECURE_BACKUP)) { +- if (prompt_failed_backupwrite(backupname)) +- goto skip_backup; +- statusbar(_("Error writing backup file %s: %s"), backupname, +- strerror(errno)); +- /* If we can't write to the backup, DONT go on, since +- whatever caused the backup file to fail (e.g. disk +- full may well cause the real file write to fail, which +- means we could lose both the backup and the original! */ +- goto cleanup_and_exit; +- } +- + free(backupname); + } + +-- +1.7.4 + diff --git a/editor/nano/files/fedora/nano-2.3.0-warnings.patch b/editor/nano/files/fedora/nano-2.3.0-warnings.patch new file mode 100644 index 0000000000..5fa561790f --- /dev/null +++ b/editor/nano/files/fedora/nano-2.3.0-warnings.patch @@ -0,0 +1,42 @@ + po/Makefile.in.in | 1 + + src/nano.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/po/Makefile.in.in b/po/Makefile.in.in +index ada8bb4..f7b2a95 100644 +--- a/po/Makefile.in.in ++++ b/po/Makefile.in.in +@@ -20,6 +20,7 @@ VPATH = @srcdir@ + + prefix = @prefix@ + exec_prefix = @exec_prefix@ ++datarootdir = @datarootdir@ + datadir = @datadir@ + localedir = $(datadir)/locale + gettextsrcdir = $(datadir)/gettext/po +diff --git a/src/nano.c b/src/nano.c +index 269ab29..5b605bf 100644 +--- a/src/nano.c ++++ b/src/nano.c +@@ -1925,7 +1925,7 @@ precalc_cleanup: + * TRUE. */ + void do_output(char *output, size_t output_len, bool allow_cntrls) + { +- size_t current_len, orig_lenpt, i = 0; ++ size_t current_len, orig_lenpt = 0, i = 0; + char *char_buf = charalloc(mb_cur_max()); + int char_buf_len; + +diff --git a/src/search.c b/src/search.c +index ca93098..3451600 100644 +--- a/src/search.c ++++ b/src/search.c +@@ -138,7 +138,7 @@ int search_init(bool replacing, bool use_answer) + int i = 0; + char *buf; + sc *s; +- void (*func)(void); ++ void (*func)(void) = (void (*)(void))0; + bool meta_key = FALSE, func_key = FALSE; + static char *backupstring = NULL; + /* The search string we'll be using. */ diff --git a/editor/nano/pspec.xml b/editor/nano/pspec.xml new file mode 100644 index 0000000000..46245b9609 --- /dev/null +++ b/editor/nano/pspec.xml @@ -0,0 +1,77 @@ + + + + + nano + http://www.nano-editor.org/ + + PisiLinux Community + admins@pisilinux.org + + GPLv3 + app:console + GNU GPL'd Pico clone with more functionality + Nano is a small, free and friendly editor which aims to replace Pico, the default editor included in the non-free Pine package. Rather than just copying Pico's look and feel, nano also implements some missing (or disabled by default) features in Pico, such as "search and replace" and "go to line number". + http://www.nano-editor.org/dist/v2.3/nano-2.3.5.tar.gz + + ncurses-devel + gettext-devel + slang + + + + + + + + nano + + ncurses + file + + + /etc + /usr/share/locale + /usr/share/doc/nano + /usr/share/man + /usr/share/info + /usr/share/nano + /usr/bin + /bin + + + + + + 2014-07-11 + 2.3.5 + Version bump. + Vedat Demir + vedat@pisilinux.org + + + 2014-05-11 + 2.3.1 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-26 + 2.3.1 + Fix dep, release bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2011-06-27 + 2.3.1 + First release + Pisi Linux Admins + admins@pisilinux.org + + + diff --git a/editor/nano/translations.xml b/editor/nano/translations.xml new file mode 100644 index 0000000000..97ae4015e7 --- /dev/null +++ b/editor/nano/translations.xml @@ -0,0 +1,9 @@ + + + + nano + Konsol ortamında kullanabileceğiniz bir metin düzenleyicidir. + Nano özgür olmayan Pine paketinin içindeki metin düzenleme programı olan Pico'nun yerine geçme hedefini güden küçük, özgür ve kullanışlı bir metin düzenleme programıdır. Pico'nun görünüşünü ve işlevini kopyalamaktan çok, Nano aynı zamanda "ara ve değiştir" ve "satır numarasına git" gibi Pico'da olmayan (veya ön tanımlı olarak kapalı) bazı özellikleri sunar. + Nano est un petit éditeur libre et convivial qui a pour but de remplacer Pico, l'éditeur par défaut inclus dans le paquet non-libre Pine. Plutôt que juste copier l'apparence et le ressenti de Pico, nan implémente également certaines fonctionnalité manquantes (ou désactivées par défaut), tel que "rechercher et remplacer" ou "allez à la ligne numéro". + +