From f08bc2f6bec8a13b515b805fabefb7f7b276fa45 Mon Sep 17 00:00:00 2001 From: Humdinger Date: Tue, 1 Sep 2015 17:28:44 +0200 Subject: [PATCH] Recipe cosmetics, impoved SUMMARY/DESCRIPTION, re-ordered blocks. --- net-fs/samba/samba-3.6.25.recipe | 65 ++++++++++++--------------- net-libs/libpcap/libpcap-1.7.4.recipe | 52 ++++++++++----------- net-libs/neon/neon-0.30.1.recipe | 47 +++++++++---------- net-libs/serf/serf-1.3.8.recipe | 42 +++++++++-------- net-misc/openssh/openssh-7.0p1.recipe | 30 ++++++------- sys-apps/less/less-466.recipe | 18 ++++---- 6 files changed, 119 insertions(+), 135 deletions(-) diff --git a/net-fs/samba/samba-3.6.25.recipe b/net-fs/samba/samba-3.6.25.recipe index d4481ccab..d51acd59d 100644 --- a/net-fs/samba/samba-3.6.25.recipe +++ b/net-fs/samba/samba-3.6.25.recipe @@ -1,29 +1,25 @@ SUMMARY="Library bits of the samba network filesystem" -DESCRIPTION=" -Samba is an Open Source/Free Software suite that provides seamless file and \ -print services to SMB/CIFS clients. Samba is freely available, unlike other \ -SMB/CIFS implementations, and allows for interoperability between Linux/Unix \ -servers and Windows-based clients. Samba is software that can be run on a \ -platform other than Microsoft Windows, for example, UNIX, Linux, IBM System \ -390, OpenVMS, and other operating systems. Samba uses the TCP/IP protocol that \ -is installed on the host server. When correctly configured, it allows that \ -host to interact with a Microsoft Windows client or server as if it is a \ -Windows file and print server." +DESCRIPTION="Samba is an free, open source software suite that provides \ +seamless file and print services to SMB/CIFS clients. Samba is freely \ +available, unlike other SMB/CIFS implementations, and allows for \ +interoperability between Linux/Unix servers and Windows-based clients. +Samba can be run on platforms other than Microsoft Windows, for example, \ +UNIX, Linux, IBM System 390, OpenVMS, and other operating systems. Samba uses \ +the TCP/IP protocol that is installed on the host server. When correctly \ +configured, it allows that host to interact with a Microsoft Windows client \ +or server as if it were a Windows file and print server." HOMEPAGE="http://www.samba.org/" COPYRIGHT="1992-2015 Anrew Tridgell and the Samba Team" LICENSE="GNU GPL v3" - -SOURCE_URI="http://ftp.samba.org/pub/samba/samba-$portVersion.tar.gz" - -CHECKSUM_SHA256="8f2c8a7f2bd89b0dfd228ed917815852f7c625b2bc0936304ac3ed63aaf83751" - REVISION="1" +SOURCE_URI="http://ftp.samba.org/pub/samba/samba-$portVersion.tar.gz" +CHECKSUM_SHA256="8f2c8a7f2bd89b0dfd228ed917815852f7c625b2bc0936304ac3ed63aaf83751" +PATCHES="samba-3.6.23.patchset" + ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" DISABLE_SOURCE_PACKAGE=yes -PATCHES="samba-3.6.23.patchset" - GLOBAL_WRITABLE_FILES=" settings/samba directory keep-old " @@ -65,7 +61,6 @@ PROVIDES=" lib:libtdb$secondaryArchSuffix = $portVersion lib:libtevent$secondaryArchSuffix = $portVersion " - REQUIRES=" haiku lib:libiconv$secondaryArchSuffix @@ -75,16 +70,28 @@ REQUIRES=" lib:libz$secondaryArchSuffix " +PROVIDES_devel=" + samba${secondaryArchSuffix}_devel = $portVersion + devel:libsmbclient$secondaryArchSuffix = $portVersion + devel:libnetapi$secondaryArchSuffix = $portVersion compat >= 0 + devel:libsmbsharemodes$secondaryArchSuffix = $portVersion compat >= 0 + devel:libtalloc$secondaryArchSuffix = $portVersion compat >= 2 + devel:libtdb$secondaryArchSuffix = $portVersion compat >= 1 + devel:libtevent$secondaryArchSuffix = $portVersion compat >= 0 + " +REQUIRES_devel=" + samba$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel devel:libiconv$secondaryArchSuffix devel:libintl$secondaryArchSuffix devel:libncurses$secondaryArchSuffix devel:libreadline$secondaryArchSuffix devel:libz$secondaryArchSuffix " - BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:find cmd:gcc$secondaryArchSuffix @@ -132,20 +139,4 @@ INSTALL() libtevent packageEntries devel $developDir -} - - -PROVIDES_devel=" - samba${secondaryArchSuffix}_devel = $portVersion - devel:libsmbclient$secondaryArchSuffix = $portVersion - devel:libnetapi$secondaryArchSuffix = $portVersion compat >= 0 - devel:libsmbsharemodes$secondaryArchSuffix = $portVersion compat >= 0 - devel:libtalloc$secondaryArchSuffix = $portVersion compat >= 2 - devel:libtdb$secondaryArchSuffix = $portVersion compat >= 1 - devel:libtevent$secondaryArchSuffix = $portVersion compat >= 0 -" - - -REQUIRES_devel=" - samba$secondaryArchSuffix == $portVersion base -" +} \ No newline at end of file diff --git a/net-libs/libpcap/libpcap-1.7.4.recipe b/net-libs/libpcap/libpcap-1.7.4.recipe index ed4a2d1b0..730567a5f 100644 --- a/net-libs/libpcap/libpcap-1.7.4.recipe +++ b/net-libs/libpcap/libpcap-1.7.4.recipe @@ -1,16 +1,15 @@ SUMMARY="A system-independent interface for user-level packet capture" -DESCRIPTION=" -libpcap provides a portable \ -framework for low-level network monitoring. Applications include \ -network statistics collection, security monitoring, network debugging, \ -etc. Since almost every system vendor provides a different interface \ -for packet capture, and since we''ve developed several tools that \ -require this functionality, we''ve created this system-independent API \ -to ease in porting and to alleviate the need for several \ -system-dependent packet capture modules in each application." +DESCRIPTION="Libpcap provides a portable framework for low-level network \ +monitoring. +Since almost every system vendor provides a different interface for packet \ +capture, this system-independent API was created to ease in porting and to \ +alleviate the need for several system-dependent packet capture modules in \ +each application. + +Applications include network statistics collection, security monitoring, \ +network debugging, etc." HOMEPAGE="http://www.tcpdump.org" -COPYRIGHT=" - 1988-1998 The Regents of the University of California +COPYRIGHT="1988-1998 The Regents of the University of California 2006 Paolo Abeni 2007 Fulko Hew, SITA INC Canada, Inc 2011-2012 Jakub Zawadzki @@ -21,25 +20,33 @@ COPYRIGHT=" 2000 Torsten Landschoff 2000 Sebastian Krahmer 2009 Felix Obenhuber - 2014 Michal Labedzki for Tieto Corporation - " + 2014 Michal Labedzki for Tieto Corporation" LICENSE="BSD (3-clause)" +REVISION="1" SOURCE_URI="http://www.tcpdump.org/release/libpcap-$portVersion.tar.gz" CHECKSUM_SHA256="7ad3112187e88328b85e46dce7a9b949632af18ee74d97ffc3f2b41fe7f448b0" -REVISION="1" +PATCHES="libpcap-$portVersion.patchset" + ARCHITECTURES="x86_gcc2 x86 x86_64 arm" SECONDARY_ARCHITECTURES="x86_gcc2 x86" -PATCHES="libpcap-$portVersion.patchset" - PROVIDES=" libpcap$secondaryArchSuffix = $portVersion lib:libpcap$secondaryArchSuffix = $portVersion compat >= 1 " - REQUIRES=" haiku$secondaryArchSuffix " + +PROVIDES_devel=" + libpcap${secondaryArchSuffix}_devel = $portVersion + cmd:pcap_config$secondaryArchSuffix + devel:libpcap$secondaryArchSuffix = $portVersion compat >= 1 + " +REQUIRES_devel=" + libpcap$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " @@ -81,14 +88,3 @@ TEST() { make check } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - libpcap${secondaryArchSuffix}_devel = $portVersion - cmd:pcap_config$secondaryArchSuffix - devel:libpcap$secondaryArchSuffix = $portVersion compat >= 1 - " -REQUIRES_devel=" - libpcap$secondaryArchSuffix == $portVersion base - " diff --git a/net-libs/neon/neon-0.30.1.recipe b/net-libs/neon/neon-0.30.1.recipe index 307d279cd..626a3482d 100644 --- a/net-libs/neon/neon-0.30.1.recipe +++ b/net-libs/neon/neon-0.30.1.recipe @@ -1,34 +1,32 @@ -SUMMARY="HTTP and WebDAV client library, with a C interface" -DESCRIPTION=" -neon is an HTTP and WebDAV client library, with a C interface. +SUMMARY="A HTTP and WebDAV client library" +DESCRIPTION="Neon is a HTTP and WebDAV client library with a C interface. Features: - high-level wrappers for common HTTP and WebDAV operations (GET, MOVE, \ -DELETE, etc) +DELETE, etc.). - low-level interface to the HTTP request/response engine, allowing the use of \ arbitrary HTTP methods, headers, etc. - authentication support including Basic and Digest support, along with \ -GSSAPI-based Negotiate on Unix, and SSPI-based Negotiate/NTLM on Win32 +GSSAPI-based Negotiate on Unix, and SSPI-based Negotiate/NTLM on Win32. - SSL/TLS support using OpenSSL or GnuTLS; exposing an abstraction layer for \ verifying server certificates, handling client certificates, and examining \ certificate properties. Smartcard-based client certificates are also supported \ via a PKCS#11 wrapper interface. -- abstract interface to parsing XML using libxml2 or expat, and wrappers for \ -simplifying handling XML HTTP response bodies +- abstract interface to parsing XML using libxml2 or expat, and wrappers to \ +simplify handling XML HTTP response bodies. - WebDAV metadata support; wrappers for PROPFIND and PROPPATCH to simplify \ -property manipulation. -" +property manipulation." HOMEPAGE="http://www.webdav.org/neon/" -LICENSE="GNU LGPL v2" COPYRIGHT="1999-2011 Joe Orton" +LICENSE="GNU LGPL v2" +REVISION="1" SOURCE_URI="http://www.webdav.org/neon/neon-$portVersion.tar.gz" CHECKSUM_SHA256="00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd" -REVISION="1" +PATCHES="neon-0.29.6.patch" + ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" -PATCHES="neon-0.29.6.patch" - PROVIDES=" neon$secondaryArchSuffix = $portVersion compat >= 0.29 lib:libneon$secondaryArchSuffix = 27.3.1 compat >= 27.2 @@ -41,7 +39,18 @@ REQUIRES=" lib:libxml2$secondaryArchSuffix lib:libz$secondaryArchSuffix " + +PROVIDES_devel=" + neon${secondaryArchSuffix}_devel = $portVersion compat >= 0.29 + cmd:neon_config$secondaryArchSuffix = $portVersion compat >= 0.29 + devel:libneon$secondaryArchSuffix = 27.3.1 compat >= 27 + " +REQUIRES_devel=" + neon$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel devel:libcrypto$secondaryArchSuffix devel:libncurses$secondaryArchSuffix devel:libssl$secondaryArchSuffix @@ -49,7 +58,6 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:libtoolize @@ -92,14 +100,3 @@ INSTALL() $developDir \ $documentationDir } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - neon${secondaryArchSuffix}_devel = $portVersion compat >= 0.29 - cmd:neon_config$secondaryArchSuffix = $portVersion compat >= 0.29 - devel:libneon$secondaryArchSuffix = 27.3.1 compat >= 27 - " -REQUIRES_devel=" - neon$secondaryArchSuffix == $portVersion base - " diff --git a/net-libs/serf/serf-1.3.8.recipe b/net-libs/serf/serf-1.3.8.recipe index 3d551974f..3e692c46b 100644 --- a/net-libs/serf/serf-1.3.8.recipe +++ b/net-libs/serf/serf-1.3.8.recipe @@ -1,25 +1,23 @@ SUMMARY="A high-performance asynchronous HTTP client library" -DESCRIPTION=" -The serf library is a C-based HTTP client library built upon the Apache \ -Portable Runtime (APR) library. It multiplexes connections, running the \ -read/write communication asynchronously. Memory copies and transformations are \ -kept to a minimum to provide high performance operation. -" +DESCRIPTION="The serf library is a C-based HTTP client library built upon the \ +Apache Portable Runtime (APR) library. It multiplexes connections, running \ +the read/write communication asynchronously. Memory copies and \ +transformations are kept to a minimum to provide high performance operation." HOMEPAGE="http://code.google.com/p/serf/" -LICENSE="Apache v2" COPYRIGHT="2002-2013 Justin Erenkrantz and Greg Stein" +LICENSE="Apache v2" +REVISION="1" SOURCE_URI="http://serf.googlecode.com/svn/src_releases/serf-$portVersion.tar.bz2" CHECKSUM_SHA256="e0500be065dbbce490449837bb2ab624e46d64fc0b090474d9acaa87c82b2590" -REVISION="1" +PATCHES="serf-$portVersion.patchset" + ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" -PATCHES="serf-$portVersion.patchset" PROVIDES=" serf$secondaryArchSuffix = $portVersion lib:libserf_1$secondaryArchSuffix = 1.3.0 compat >= 1 " - REQUIRES=" haiku$secondaryArchSuffix lib:libssl$secondaryArchSuffix @@ -31,6 +29,17 @@ REQUIRES=" lib:libexpat$secondaryArchSuffix lib:libiconv$secondaryArchSuffix " + +PROVIDES_devel=" + serf${secondaryArchSuffix}_devel = $portVersion + devel:libserf_1$secondaryArchSuffix = 1.3.0 compat >= 1 + " +REQUIRES_devel=" + serf$secondaryArchSuffix == $portVersion base + devel:libapr_1$secondaryArchSuffix + devel:libaprutil_1$secondaryArchSuffix + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libssl$secondaryArchSuffix @@ -47,6 +56,7 @@ BUILD_PREREQUIRES=" #cmd:make cmd:scons >= 2.3 " + BUILD() { scons $jobArgs OPENSSL=$portPackageLinksDir/devel~libssl$secondaryArchSuffix \ @@ -82,15 +92,3 @@ INSTALL() # devel package packageEntries devel $developDir } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - serf${secondaryArchSuffix}_devel = $portVersion - devel:libserf_1$secondaryArchSuffix = 1.3.0 compat >= 1 - " -REQUIRES_devel=" - serf$secondaryArchSuffix == $portVersion base - devel:libapr_1$secondaryArchSuffix - devel:libaprutil_1$secondaryArchSuffix - " diff --git a/net-misc/openssh/openssh-7.0p1.recipe b/net-misc/openssh/openssh-7.0p1.recipe index 2399103f1..c62dbb02c 100644 --- a/net-misc/openssh/openssh-7.0p1.recipe +++ b/net-misc/openssh/openssh-7.0p1.recipe @@ -1,30 +1,30 @@ -SUMMARY="Secure Shell Client and Server (Remote Login Program)" -DESCRIPTION=" -OpenSSH is a FREE version of the SSH connectivity tools that technical users \ -of the Internet rely on. Users of telnet, rlogin, and ftp may not realize that \ -their password is transmitted across the Internet unencrypted, but it is. \ +SUMMARY="Secure Shell client and server (remote login program)" +DESCRIPTION="OpenSSH is a free version of the SSH connectivity tools that \ +technical users of the Internet rely on. Users of telnet, rlogin, and ftp may \ +not realize that their password is transmitted across the Internet \ +unencrypted, but it is. + OpenSSH encrypts all traffic (including passwords) to effectively eliminate \ eavesdropping, connection hijacking, and other attacks. Additionally, OpenSSH \ provides secure tunneling capabilities and several authentication methods, and \ supports all SSH protocol versions. + The OpenSSH suite replaces rlogin and telnet with the ssh program, rcp with \ scp, and ftp with sftp. Also included is sshd (the server side of the \ package), and the other utilities like ssh-add, ssh-agent, ssh-keysign, \ -ssh-keyscan, ssh-keygen and sftp-server. -" +ssh-keyscan, ssh-keygen and sftp-server." HOMEPAGE="http://www.openssh.com/" -LICENSE="OpenSSH" COPYRIGHT="2005-2015 Tatu Ylonen et al." +LICENSE="OpenSSH" +REVISION="1" SOURCE_URI="http://ftp.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$portVersion.tar.gz" CHECKSUM_SHA256="fd5932493a19f4c81153d812ee4e042b49bbd3b759ab3d9344abecc2bc1485e5" -REVISION="1" +PATCHES="sshd_config.patch + pathnames.patch + bzero.patch" ARCHITECTURES="x86_gcc2 x86 x86_64" -PATCHES="sshd_config.patch - pathnames.patch - bzero.patch" - ADDITIONAL_FILES="sshd_keymaker.sh" PROVIDES=" @@ -52,7 +52,9 @@ REQUIRES=" lib:libssl lib:libz " + BUILD_REQUIRES=" + haiku_devel devel:libcrypto devel:libedit devel:libncurses @@ -60,7 +62,6 @@ BUILD_REQUIRES=" devel:libz " BUILD_PREREQUIRES=" - haiku_devel cmd:aclocal cmd:autoconf cmd:automake @@ -86,7 +87,6 @@ PACKAGE_USERS=" " PACKAGE_GROUPS="sshd" - PATCH() { echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac diff --git a/sys-apps/less/less-466.recipe b/sys-apps/less/less-466.recipe index c416cc9bb..92bf1f56c 100644 --- a/sys-apps/less/less-466.recipe +++ b/sys-apps/less/less-466.recipe @@ -1,17 +1,18 @@ SUMMARY="A free, open-source file pager" -DESCRIPTION="GNU less is a program similar to more, but which allows \ -backward movement in the file as well as forward movement. Also, less \ +DESCRIPTION="GNU 'less' is a program similar to 'more', but which allows \ +backward movement in the file as well as forward movement. Also, 'less' \ does not have to read the entire input file before starting, so with \ -large input files it starts up faster than text editors like vi. Less uses \ -termcap (or terminfo on some systems), so it can run on a variety of \ -terminals. There is even limited support for hardcopy terminals." +large input files it starts up faster than text editors like 'vi'. +Less uses 'termcap' (or 'terminfo' on some systems), so it can run on a \ +variety of terminals. There is even limited support for hardcopy terminals." HOMEPAGE="http://www.greenwoodsoftware.com/less/" +COPYRIGHT="1984-2014 Mark Nudelman" +LICENSE="GNU GPL v3" +REVISION="1" SOURCE_URI="http://www.greenwoodsoftware.com/less/less-$portVersion.tar.gz" CHECKSUM_SHA256="8305f5a06764ff094ed3428f94f29059541e2483eae201991f90823da6557212" PATCHES="less-$portVersion.patchset" -LICENSE="GNU GPL v3" -COPYRIGHT="1984-2014 Mark Nudelman" -REVISION="1" + ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" PROVIDES=" @@ -24,6 +25,7 @@ REQUIRES=" haiku$secondaryArchSuffix lib:libncurses$secondaryArchSuffix " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libncurses$secondaryArchSuffix