Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (3dc817163efa23aa166898e277c23973ca2c9699)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (3dc817163efa23aa166898e277c23973ca2c9699)
  • Date: Tue, 26 May 2015 14:04:19 -0500

GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert
<treeve AT sourcemage.org>:

ChangeLog | 7
KDE4_FUNCTIONS | 8
QT5_DEPENDS | 2
doc/evince/DETAILS | 4
doc/evince/HISTORY | 3
net/openbsd-inetd/BUILD | 3
net/openbsd-inetd/DEPENDS | 2
net/openbsd-inetd/DETAILS | 21 ++
net/openbsd-inetd/HISTORY | 3
net/openbsd-inetd/INSTALL | 3
net/openbsd-inetd/PRE_BUILD | 6
net/openbsd-inetd/patches/portability.patch | 233
++++++++++++++++++++++++++++
python-pypi/setuptools/DETAILS | 4
python-pypi/setuptools/HISTORY | 3
x11-toolkits/gtk+3/DETAILS | 4
x11-toolkits/gtk+3/HISTORY | 3
16 files changed, 297 insertions(+), 12 deletions(-)

New commits:
commit e6fe774b41e4c7bce1163533265dd8e07646838f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

fix KDE4_FUNCTIONS

commit 25ddd9e0424aa384de9dbb5a8b9f5ad3b8a5cf0b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

setuptools: => 16.0

commit 4abf61201ef6a721d3ee6a5e85cf5edfffa1a177
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

KDE5_DEPENDS, QT5_DEPENDS: depends -sub CXX gcc

commit 4c395079e6dab37893ba3f87c77763311dbc7cbc
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

doc/evince: downgraded to stable 3.16.0

commit 82f7b87e55f1b6d6ab0fcc610886d83569fe3b8c
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

x11-toolkits/gtk+3: downgraded stable branch to 3.16.3

commit d88ac9078cc807e785c637ac21fae93382f36949
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

openbsd-inetd: new spell, OpenBSD Internet Superserver

diff --git a/ChangeLog b/ChangeLog
index ed3c6e4..432e3c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,13 @@
2015-05-26 Treeve Jelbert <treeve AT sourcemage.org>
- * KDE?_DEPENDS, QT5_DEPENDS: depends -sub CXX gcc
+ * KDE4_FUNCTIONS: fix typo, remove ref to cmake_install
+
+2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
+ * KDE5_DEPENDS, QT5_DEPENDS: directly depend -sub CXX gcc
+ (to make up_triggers from ABI updates work)

2015-05-25 Ismael Luceno <ismael AT sourcemage.org>
* disk/hoz: new spell, Hacha Open Zource file splitter
+ * net/openbsd-inetd: new spell, OpenBSD Internet Superserver

2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* FUNCTIONS: added check_dependees_on_update() for use in
diff --git a/KDE4_FUNCTIONS b/KDE4_FUNCTIONS
index 392efb7..8df8f8c 100755
--- a/KDE4_FUNCTIONS
+++ b/KDE4_FUNCTIONS
@@ -6,9 +6,9 @@ default_build() {
kde4_build
}

-function default_install() {
- cmake_install
-}
+#function default_install() {
+# cmake_install
+#}

#---------------------------------------------------------------------
function kde4_build() {
@@ -26,7 +26,7 @@ local DD
DD=$KDE4DIR
if is_depends_enabled $SPELL shared-mime-info;then
update-mime-database $DD/share/mime/
- fir
+ fi
if [[ -e $DD/share/desktop-directories ]]; then
update-desktop-database $DD/share/desktop-directories
fi
diff --git a/QT5_DEPENDS b/QT5_DEPENDS
index a577daf..0c3827d 100755
--- a/QT5_DEPENDS
+++ b/QT5_DEPENDS
@@ -1,3 +1,3 @@
-depends-sub CXX gcc &&
+depends -sub CXX gcc &&
depends cmake &&
depends qtbase
diff --git a/doc/evince/DETAILS b/doc/evince/DETAILS
index b5ef5b4..5a1426e 100755
--- a/doc/evince/DETAILS
+++ b/doc/evince/DETAILS
@@ -1,11 +1,11 @@
SPELL=evince
- VERSION=3.17.1
+ VERSION=3.16.0
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
WEB_SITE=http://www.gnome.org/projects/evince
-
SOURCE_HASH=sha512:759677f62a049ccb3194808bdb49bbd05d486ff7d7ad371901fe91b1c82029fb2540425c13e35adfee031c0abf0621920519c63fa5c99eea22d4e602cb7213f3
+
SOURCE_HASH=sha512:fc3c1469edf453cd62ca157ff54f40ee56b88f47ff537ade0f5ff8d659d794d2b87563109f5e116c46b1651e52dc6c00e7f0b9b13827f34e1a95747f7432ef27
LICENSE[0]=GPL
ENTERED=20050502
KEYWORDS="doc"
diff --git a/doc/evince/HISTORY b/doc/evince/HISTORY
index ae9b555..7beb527 100644
--- a/doc/evince/HISTORY
+++ b/doc/evince/HISTORY
@@ -1,3 +1,6 @@
+2015-05-25 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: downgraded to stable 3.16.0
+
2015-05-24 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated spell to 3.17.1

diff --git a/net/openbsd-inetd/BUILD b/net/openbsd-inetd/BUILD
new file mode 100755
index 0000000..66fd05f
--- /dev/null
+++ b/net/openbsd-inetd/BUILD
@@ -0,0 +1,3 @@
+bmake \
+ CFLAGS="$CFLAGS -isystem $INSTALL_ROOT/usr/include/bsd -DLIBBSD_OVERLAY"
\
+ LDFLAGS="${LDFLAGS//-Wl,--as-needed} -lbsd"
diff --git a/net/openbsd-inetd/DEPENDS b/net/openbsd-inetd/DEPENDS
new file mode 100755
index 0000000..ed94dab
--- /dev/null
+++ b/net/openbsd-inetd/DEPENDS
@@ -0,0 +1,2 @@
+depends libbsd &&
+depends bmake
diff --git a/net/openbsd-inetd/DETAILS b/net/openbsd-inetd/DETAILS
new file mode 100755
index 0000000..cb3be05
--- /dev/null
+++ b/net/openbsd-inetd/DETAILS
@@ -0,0 +1,21 @@
+ SPELL=openbsd-inetd
+ VERSION=0.20140418
+ SOURCE="${SPELL}_$VERSION.orig.tar.xz"
+ SOURCE_URL[0]=http://ftp.de.debian.org/debian/pool/main/o/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:5000b18bc36879d99cc15e7e72aa6c4156a53c86350b6a5f0fb6658bd9479b448885af8d5cf6e7393113e5f33d238f6567d56a23652adc09b97137b3e4934c62
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE="https://packages.debian.org/sid/openbsd-inetd";
+ LICENSE[0]="ISC"
+ ENTERED=20150126
+ KEYWORDS=""
+ SHORT="OpenBSD Internet Superserver"
+cat << EOF
+The inetd server is a network daemon program that specializes in managing
+incoming network connections. Its configuration file tells it what program
+needs to be run when an incoming connection is received. Any service port
+may be configured for either of the tcp or udp protocols.
+
+This is a port of the OpenBSD daemon with some debian-specific features. This
+package supports IPv6, built-in libwrap access control, binding to specific
+addresses, UNIX domain sockets and socket buffers tuning.
+EOF
diff --git a/net/openbsd-inetd/HISTORY b/net/openbsd-inetd/HISTORY
new file mode 100644
index 0000000..31444b2
--- /dev/null
+++ b/net/openbsd-inetd/HISTORY
@@ -0,0 +1,3 @@
+2015-05-25 Ismael Luceno <ismael AT sourcemage.org>
+ * patches/portability.patch: Portability patch
+ * BUILD, DEPENDS, DETAILS, INSTALL, PRE_BUILD: spell created
diff --git a/net/openbsd-inetd/INSTALL b/net/openbsd-inetd/INSTALL
new file mode 100755
index 0000000..6b9d782
--- /dev/null
+++ b/net/openbsd-inetd/INSTALL
@@ -0,0 +1,3 @@
+mandir="$INSTALL_ROOT"/usr/share/man
+mkdir -p "$mandir/cat8" "$mandir/cat5" &&
+bmake install BINDIR="$INSTALL_ROOT"/bin MANDIR="$mandir"
diff --git a/net/openbsd-inetd/PRE_BUILD b/net/openbsd-inetd/PRE_BUILD
new file mode 100755
index 0000000..f9d7f22
--- /dev/null
+++ b/net/openbsd-inetd/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+if [ -d "$SPELL_DIRECTORY/patches" ]; then
+ find "$SPELL_DIRECTORY/patches" \( -name \*.patch -o -name \*.diff \) \
+ -exec patch -fp1 -i '{}' \;
+fi
diff --git a/net/openbsd-inetd/patches/portability.patch
b/net/openbsd-inetd/patches/portability.patch
new file mode 100644
index 0000000..c354baf
--- /dev/null
+++ b/net/openbsd-inetd/patches/portability.patch
@@ -0,0 +1,233 @@
+Author: Marco d'Itri
+
+Portability patch. Taken from Debian, includes a few modifications by me
+(Ismael Luceno).
+
+--- a/inetd.8
++++ b/inetd.8
+@@ -42,11 +42,7 @@
+ .Op Ar configuration_file
+ .Sh DESCRIPTION
+ .Nm inetd
+-should be run at boot time by
+-.Pa /etc/rc
+-(see
+-.Xr rc 8 ) .
+-It then listens for connections on certain internet sockets.
++listens for connections on certain internet sockets.
+ When a connection is found on one
+ of its sockets, it decides what service the socket
+ corresponds to, and invokes a program to service the request.
+@@ -149,7 +145,8 @@ The
+ .Em service name
+ entry is the name of a valid service in
+ the file
+-.Pa /etc/services .
++.Pa /etc/services
++or a port number.
+ For
+ .Dq internal
+ services (discussed below), the service
+@@ -166,7 +163,7 @@ The part on the right of the
+ is the RPC version number.
+ This can simply be a single numeric argument or a range of versions.
+ A range is bounded by the low version to the high version -
+-.Dq rusers/1-3 .
++.Dq rusers/1\-3 .
+ For
+ .Ux Ns -domain
+ sockets this field specifies the path name of the socket.
+@@ -186,7 +183,8 @@ reliably delivered message, or sequenced
+ The
+ .Em protocol
+ must be a valid protocol as given in
+-.Pa /etc/protocols .
++.Pa /etc/protocols or
++.Dq unix .
+ Examples might be
+ .Dq tcp
+ or
+@@ -368,9 +366,7 @@ If you have only one server on
+ only IPv6 traffic will be routed to the server.
+ .El
+ .Sh SEE ALSO
+-.Xr comsat 8 ,
+ .Xr fingerd 8 ,
+-.Xr ftp-proxy 8 ,
+ .Xr ftpd 8 ,
+ .Xr identd 8 ,
+ .Xr talkd 8
+@@ -383,7 +379,23 @@ Support for Sun-RPC
+ based services is modelled after that
+ provided by SunOS 4.1.
+ IPv6 support was added by the KAME project in 1999.
++.Pp
++Marco d'Itri ported this code from OpenBSD in summer 2002 and added
++socket buffers tuning and libwrap support from the NetBSD source tree.
+ .Sh BUGS
++On Linux systems, the daemon cannot reload its configuration and needs
++to be restarted when the host address for a service is changed between
++.Dq \&*
++and a specific address.
++.Pp
++Server programs used with
++.Dq dgram
++.Dq udp
++.Dq nowait
++must read from the network socket, or
++.Nm inetd
++will spawn processes until the maximum is reached.
++.Pp
+ Host address specifiers, while they make conceptual sense for RPC
+ services, do not work entirely correctly.
+ This is largely because the
+--- a/inetd.c
++++ b/inetd.c
+@@ -128,6 +128,7 @@
+ #include <sys/un.h>
+ #include <sys/file.h>
+ #include <sys/wait.h>
++#include <time.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
+
+@@ -146,11 +147,12 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
++#ifdef HAVE_SETUSERCONTEXT
+ #include <login_cap.h>
++#endif
+ #include <ifaddrs.h>
+ #include <rpc/rpc.h>
+ #include <rpc/pmap_clnt.h>
+-#include <rpcsvc/nfs_prot.h>
+ #include "pathnames.h"
+
+ #define TOOMANY 256 /* don't start more than
TOOMANY */
+@@ -324,14 +328,11 @@ main(int argc, char *argv[])
+ fd_set *fdsrp = NULL;
+ int readablen = 0, ch;
+ struct servtab *sep;
+- extern char *optarg;
+- extern int optind;
+
+ while ((ch = getopt(argc, argv, "dR:")) != -1)
+ switch (ch) {
+ case 'd':
+ debug = 1;
+- options |= SO_DEBUG;
+ break;
+ case 'R': { /* invocation rate */
+ char *p;
+@@ -373,9 +374,13 @@ main(int argc, char *argv[])
+ umask(022);
+ if (debug == 0) {
+ daemon(0, 0);
++#ifdef HAVE_SETLOGIN
+ if (uid == 0)
+ (void) setlogin("");
++#endif
+ }
++ if (debug && uid == 0)
++ options |= SO_DEBUG;
+
+ if (uid == 0) {
+ gid_t gid = getgid();
+@@ -420,6 +425,15 @@ main(int argc, char *argv[])
+ sa.sa_handler = SIG_IGN;
+ sigaction(SIGPIPE, &sa, &sapipe);
+
++ /* space for daemons to overwrite environment for ps */
++ {
++#define DUMMYSIZE 100
++ char dummy[DUMMYSIZE];
++ memset(dummy, 'x', DUMMYSIZE - 1);
++ dummy[DUMMYSIZE - 1] = '\0';
++ setenv("inetd_dummy", dummy, 1);
++ }
++
+ for (;;) {
+ int n, ctrl = -1;
+
+@@ -576,9 +590,6 @@ dg_badinput(struct sockaddr *sa)
+ goto bad;
+ }
+
+- if (port < IPPORT_RESERVED || port == NFS_PORT)
+- goto bad;
+-
+ return (0);
+
+ bad:
+@@ -1852,7 +1865,7 @@ print_service(char *action, struct servt
+ fprintf(stderr,
+ " wait.max=%d.%d user:group=%s:%s builtin=%lx server=%s\n",
+ sep->se_wait, sep->se_max, sep->se_user,
+- sep->se_group ? sep->se_group : "wheel",
++ sep->se_group ? sep->se_group : "(default)",
+ (long)sep->se_bi, sep->se_server);
+ }
+
+@@ -1960,6 +1973,7 @@ spawn(struct servtab *sep, int ctrl)
+ if (uid != pwd->pw_uid)
+ exit(1);
+ } else {
++#ifdef HAVE_SETUSERCONTEXT
+ tmpint = LOGIN_SETALL &
+ ~(LOGIN_SETGROUP|LOGIN_SETLOGIN);
+ if (pwd->pw_uid)
+@@ -1975,6 +1989,53 @@ spawn(struct servtab *sep, int ctrl)
+ sep->se_service, sep->se_proto);
+ exit(1);
+ }
++#else
++ /* what about setpriority(2), setrlimit(2),
++ * and umask(2)? The $PATH is cleared.
++ */
++ if (pwd->pw_uid) {
++ if (sep->se_group)
++ pwd->pw_gid = grp->gr_gid;
++ if (setgid(pwd->pw_gid) < 0) {
++ syslog(LOG_ERR,
++ "%s/%s: can't set gid %d: %m",
++ sep->se_service, sep->se_proto,
++ pwd->pw_gid);
++ exit(1);
++ }
++ if (initgroups(pwd->pw_name, pwd->pw_gid)
++ < 0) {
++ syslog(LOG_ERR,
++ "%s/%s: can't initgroups(%s): %m",
++ sep->se_service, sep->se_proto,
++ pwd->pw_name);
++ exit(1);
++ }
++ if (setuid(pwd->pw_uid) < 0) {
++ syslog(LOG_ERR,
++ "%s/%s: can't set uid %d: %m",
++ sep->se_service,
sep->se_proto,
++ pwd->pw_uid);
++ exit(1);
++ }
++ } else if (sep->se_group) {
++ if (setgid(pwd->pw_gid) < 0) {
++ syslog(LOG_ERR,
++ "%s/%s: can't set gid %d: %m",
++ sep->se_service, sep->se_proto,
++ pwd->pw_gid);
++ exit(1);
++ }
++ if (initgroups(pwd->pw_name, pwd->pw_gid)
++ < 0) {
++ syslog(LOG_ERR,
++ "%s/%s: can't initgroups(%s): %m",
++ sep->se_service, sep->se_proto,
++ pwd->pw_name);
++ exit(1);
++ }
++ }
++#endif
+ }
+ if (debug)
+ fprintf(stderr, "%ld execv %s\n",
diff --git a/python-pypi/setuptools/DETAILS b/python-pypi/setuptools/DETAILS
index d364ce3..3c12a0c 100755
--- a/python-pypi/setuptools/DETAILS
+++ b/python-pypi/setuptools/DETAILS
@@ -1,6 +1,6 @@
SPELL=setuptools
- VERSION=14.3.1
-
SOURCE_HASH=sha512:bac53cd2594d3e30d788b7d0bfee091253e23b4afef90b3171ff24e015626932cfefd83076d44f1ebabd01f994252f726978b85c95b82c9c2721e925f216ee8a
+ VERSION=16.0
+
SOURCE_HASH=sha512:38a89aad89dc9aa682dbfbca623e2f69511f5e20d4a3526c01aabbc7e93ae78f20aac566676b431e111540b41540a1c4f644ce4174e7ecf052318612075e02dc
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=https://pypi.python.org/packages/source/s/$SPELL/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/python-pypi/setuptools/HISTORY b/python-pypi/setuptools/HISTORY
index cd5f7ec..38e1b08 100644
--- a/python-pypi/setuptools/HISTORY
+++ b/python-pypi/setuptools/HISTORY
@@ -1,3 +1,6 @@
+2015-05-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 16.0
+
2015-03-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 14.3.1

diff --git a/x11-toolkits/gtk+3/DETAILS b/x11-toolkits/gtk+3/DETAILS
index 9028c5d..5656851 100755
--- a/x11-toolkits/gtk+3/DETAILS
+++ b/x11-toolkits/gtk+3/DETAILS
@@ -3,8 +3,8 @@ if [[ $GTK_VER == devel ]];then
VERSION=3.17.1

SOURCE_HASH=sha512:4a3b4d9e11e1b320856468f2e25c60eeb9159939de09a82a4a30f99a39e795a5af44023646f6eb18a70bbb8f3880753846a3a9142cfc97a8efa5f32294cb1206
else
- VERSION=3.17.1
-
SOURCE_HASH=sha512:4a3b4d9e11e1b320856468f2e25c60eeb9159939de09a82a4a30f99a39e795a5af44023646f6eb18a70bbb8f3880753846a3a9142cfc97a8efa5f32294cb1206
+ VERSION=3.16.3
+
SOURCE_HASH=sha512:5ab6ff3f4e4c47dd8532027bfade1420524d48b53f7c7bcef4ee581095ecc53f33ac072076837ed34306d5d84103958b27a3099b10e5cf95c38fb34342fc8aa8
fi
SOURCE=gtk+-$VERSION.tar.xz
BRANCH=`echo $VERSION | cut -d . -f 1,2`
diff --git a/x11-toolkits/gtk+3/HISTORY b/x11-toolkits/gtk+3/HISTORY
index 6ae6e91..d9b3853 100644
--- a/x11-toolkits/gtk+3/HISTORY
+++ b/x11-toolkits/gtk+3/HISTORY
@@ -1,3 +1,6 @@
+2015-05-25 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: downgraded stable branch to 3.16.3
+
2015-05-24 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated spell to 3.17.1




  • [SM-Commit] GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (3dc817163efa23aa166898e277c23973ca2c9699), Treeve Jelbert, 05/26/2015

Archive powered by MHonArc 2.6.24.

Top of Page