From 2b1384da4a2d00b72e0c57c998edce573cada72a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Sun, 21 Jun 2015 17:28:26 +0300 Subject: [PATCH] mit-kerberos and keyutils in main --- .../prison-qt5/1actions.py | 0 .../prison-qt5/actions.py | 0 .../prison-qt5/pspec.xml | 0 .../graphics}/libdmtx/actions.py | 0 .../graphics}/libdmtx/pspec.xml | 0 .../graphics}/libdmtx/translations.xml | 0 .../misc}/qrencode/actions.py | 0 .../misc}/qrencode/pspec.xml | 0 .../misc}/qrencode/translations.xml | 0 server/auth/component.xml | 3 + server/auth/mit-kerberos/actions.py | 87 ++++++++++++++ .../files/fix-python-detection.patch | 15 +++ server/auth/mit-kerberos/files/kdc.conf | 16 +++ .../files/krb5-config_LDFLAGS.patch | 11 ++ server/auth/mit-kerberos/files/krb5.conf | 25 +++++ .../files/mit-krb5-1.12_uninitialized.patch | 55 +++++++++ .../files/rebuild-configure-scripts.patch | 12 ++ server/auth/mit-kerberos/pspec.xml | 106 ++++++++++++++++++ server/auth/mit-kerberos/translations.xml | 8 ++ util/crypt/keyutils/actions.py | 17 +++ util/crypt/keyutils/pspec.xml | 65 +++++++++++ util/crypt/keyutils/translations.xml | 9 ++ 22 files changed, 429 insertions(+) rename desktop/kde/{kde5-dependencies => kde5-addon}/prison-qt5/1actions.py (100%) rename desktop/kde/{kde5-dependencies => kde5-addon}/prison-qt5/actions.py (100%) rename desktop/kde/{kde5-dependencies => kde5-addon}/prison-qt5/pspec.xml (100%) rename {desktop/kde/kde5-dependencies => multimedia/graphics}/libdmtx/actions.py (100%) rename {desktop/kde/kde5-dependencies => multimedia/graphics}/libdmtx/pspec.xml (100%) rename {desktop/kde/kde5-dependencies => multimedia/graphics}/libdmtx/translations.xml (100%) rename {desktop/kde/kde5-dependencies => programming/misc}/qrencode/actions.py (100%) rename {desktop/kde/kde5-dependencies => programming/misc}/qrencode/pspec.xml (100%) rename {desktop/kde/kde5-dependencies => programming/misc}/qrencode/translations.xml (100%) create mode 100644 server/auth/component.xml create mode 100644 server/auth/mit-kerberos/actions.py create mode 100644 server/auth/mit-kerberos/files/fix-python-detection.patch create mode 100644 server/auth/mit-kerberos/files/kdc.conf create mode 100644 server/auth/mit-kerberos/files/krb5-config_LDFLAGS.patch create mode 100644 server/auth/mit-kerberos/files/krb5.conf create mode 100644 server/auth/mit-kerberos/files/mit-krb5-1.12_uninitialized.patch create mode 100644 server/auth/mit-kerberos/files/rebuild-configure-scripts.patch create mode 100644 server/auth/mit-kerberos/pspec.xml create mode 100644 server/auth/mit-kerberos/translations.xml create mode 100644 util/crypt/keyutils/actions.py create mode 100644 util/crypt/keyutils/pspec.xml create mode 100644 util/crypt/keyutils/translations.xml diff --git a/desktop/kde/kde5-dependencies/prison-qt5/1actions.py b/desktop/kde/kde5-addon/prison-qt5/1actions.py similarity index 100% rename from desktop/kde/kde5-dependencies/prison-qt5/1actions.py rename to desktop/kde/kde5-addon/prison-qt5/1actions.py diff --git a/desktop/kde/kde5-dependencies/prison-qt5/actions.py b/desktop/kde/kde5-addon/prison-qt5/actions.py similarity index 100% rename from desktop/kde/kde5-dependencies/prison-qt5/actions.py rename to desktop/kde/kde5-addon/prison-qt5/actions.py diff --git a/desktop/kde/kde5-dependencies/prison-qt5/pspec.xml b/desktop/kde/kde5-addon/prison-qt5/pspec.xml similarity index 100% rename from desktop/kde/kde5-dependencies/prison-qt5/pspec.xml rename to desktop/kde/kde5-addon/prison-qt5/pspec.xml diff --git a/desktop/kde/kde5-dependencies/libdmtx/actions.py b/multimedia/graphics/libdmtx/actions.py similarity index 100% rename from desktop/kde/kde5-dependencies/libdmtx/actions.py rename to multimedia/graphics/libdmtx/actions.py diff --git a/desktop/kde/kde5-dependencies/libdmtx/pspec.xml b/multimedia/graphics/libdmtx/pspec.xml similarity index 100% rename from desktop/kde/kde5-dependencies/libdmtx/pspec.xml rename to multimedia/graphics/libdmtx/pspec.xml diff --git a/desktop/kde/kde5-dependencies/libdmtx/translations.xml b/multimedia/graphics/libdmtx/translations.xml similarity index 100% rename from desktop/kde/kde5-dependencies/libdmtx/translations.xml rename to multimedia/graphics/libdmtx/translations.xml diff --git a/desktop/kde/kde5-dependencies/qrencode/actions.py b/programming/misc/qrencode/actions.py similarity index 100% rename from desktop/kde/kde5-dependencies/qrencode/actions.py rename to programming/misc/qrencode/actions.py diff --git a/desktop/kde/kde5-dependencies/qrencode/pspec.xml b/programming/misc/qrencode/pspec.xml similarity index 100% rename from desktop/kde/kde5-dependencies/qrencode/pspec.xml rename to programming/misc/qrencode/pspec.xml diff --git a/desktop/kde/kde5-dependencies/qrencode/translations.xml b/programming/misc/qrencode/translations.xml similarity index 100% rename from desktop/kde/kde5-dependencies/qrencode/translations.xml rename to programming/misc/qrencode/translations.xml diff --git a/server/auth/component.xml b/server/auth/component.xml new file mode 100644 index 0000000000..ba01450986 --- /dev/null +++ b/server/auth/component.xml @@ -0,0 +1,3 @@ + + server.auth + diff --git a/server/auth/mit-kerberos/actions.py b/server/auth/mit-kerberos/actions.py new file mode 100644 index 0000000000..addc34989c --- /dev/null +++ b/server/auth/mit-kerberos/actions.py @@ -0,0 +1,87 @@ +#!/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 +from pisi.actionsapi import shelltools + +pisitools.flags.add("-fPIC -fno-strict-aliasing -fno-strict-overflow -fstack-protector-all") +pisitools.cxxflags.add("-I/usr/include/et") + +def rename_man_pages(): + manpages = ["appl/bsd/klogind.M", + "appl/bsd/kshd.M", + "appl/sample/sserver/sserver.M", + "appl/telnet/telnetd/telnetd.8", + "appl/gssftp/ftpd/ftpd.M", + "config-files/kdc.conf.M", + "config-files/krb5.conf.M", + "kadmin/cli/kadmin.M", + "slave/kpropd.M", + "slave/kprop.M"] + for manpage in manpages: + shelltools.move(manpage, "%s.in" % manpage) + +def setup(): + shelltools.cd("src") + shelltools.system("sed -i -e 's/^YYSTYPE yylval/&={0}/' lib/krb5/krb/deltat.c") + pisitools.dosed("util/ac_check_krb5.m4", "(KRB5ROOT=\/usr)\/local", r"\1") + + autotools.autoreconf("-fi") + + # Fix pthread linking + #pisitools.dosed("configure", "-lthread", "-lpthread") + #pisitools.dosed("configure", "-pthread", "-lpthread") + + autotools.configure("--localstatedir=/var/lib \ + --without-tcl \ + --without-hesiod \ + --enable-shared \ + --enable-kdc-lookaside-cache \ + --without-system-verto \ + --disable-rpath \ + --with-system-et \ + --with-system-ss \ + --enable-dns-for-realm") + + # Fix krb5-config script to remove rpaths and CFLAGS + #pisitools.dosed("krb5-config", "^CC_LINK=.*", "CC_LINK='$(CC) $(PROG_LIBPATH)'") + # Fix unused dependency + pisitools.dosed("config/shlib.conf"," -shared ", " -Wl,--as-needed -shared ") + +def build(): + autotools.make("-C src/") + +# def check(): + # check failed + # autotools.make("-C src/ -j1 check") + # import tempfile + # import shutil + # tmpdir = tempfile.mkdtemp(prefix='pisitest') + # autotools.make("-C src/ check TMPDIR=%s -j1" % tmpdir) + # shutil.rmtree("rm -rf %s" % tmpdir) + +def install(): + pisitools.dodoc("NOTICE", "README") + shelltools.cd("src") + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + # Install additional headers + for d in ("kadm5", "krb5"): + pisitools.insinto("/usr/include/%s" % d, "include/%s/*.h" % d) + + # Add "k" prefix to some apps and manpages to resolve conflicts + #for app in ["telnetd", "ftpd"]: + # pisitools.rename("/usr/share/man/man8/%s.8" % app, "k%s.8" % app) + # pisitools.rename("/usr/sbin/%s" % app, "k%s" % app) + + #for app in ["rcp", "rsh", "telnet", "ftp", "rlogin"]: + # pisitools.rename("/usr/share/man/man1/%s.1" % app, "k%s.1" % app) + # pisitools.rename("/usr/bin/%s" % app, "k%s" % app) + + # Remove examples + pisitools.removeDir("/usr/share/examples") diff --git a/server/auth/mit-kerberos/files/fix-python-detection.patch b/server/auth/mit-kerberos/files/fix-python-detection.patch new file mode 100644 index 0000000000..bcccf90bf8 --- /dev/null +++ b/server/auth/mit-kerberos/files/fix-python-detection.patch @@ -0,0 +1,15 @@ +--- configure.in.orig 2014-01-16 02:44:15.000000000 +0200 ++++ src/configure.in 2014-05-17 17:05:05.317924895 +0300 +@@ -1206,9 +1206,9 @@ + # default, so it's not a big deal that it isn't very good. We should + # use python-config instead. + PYTHON_LIB= +-AC_CHECK_HEADERS(Python.h python2.3/Python.h python2.5/Python.h) +-AC_CHECK_LIB(python2.3,main,[PYTHON_LIB=-lpython2.3], +- AC_CHECK_LIB(python2.5,main,[PYTHON_LIB=-lpython2.5])) ++AC_CHECK_HEADERS(Python.h python2.5/Python.h python2.7/Python.h) ++AC_CHECK_LIB(python2.5,main,[PYTHON_LIB=-lpython2.5], ++ AC_CHECK_LIB(python2.7,main,[PYTHON_LIB=-lpython2.7])) + AC_SUBST(PYTHON_LIB) + + diff --git a/server/auth/mit-kerberos/files/kdc.conf b/server/auth/mit-kerberos/files/kdc.conf new file mode 100644 index 0000000000..3cf14aafc4 --- /dev/null +++ b/server/auth/mit-kerberos/files/kdc.conf @@ -0,0 +1,16 @@ +[kdcdefaults] + kdc_ports = 88,750 + +[realms] + EXAMPLE.COM = { + database_name = /etc/krb5kdc/principal + admin_keytab = /etc/krb5kdc/kadm5.keytab + acl_file = /etc/krb5kdc/kadm5.acl + dict_file = /etc/krb5kdc/kadm5.dict + key_stash_file = /etc/krb5kdc/.k5.EXAMPLE.COM + kadmind_port = 749 + max_life = 10h 0m 0s + max_renewable_life = 7d 0h 0m 0s + master_key_type = des3-hmac-sha1 + supported_enctypes = des3-hmac-sha1:normal des-cbc-crc:normal + } diff --git a/server/auth/mit-kerberos/files/krb5-config_LDFLAGS.patch b/server/auth/mit-kerberos/files/krb5-config_LDFLAGS.patch new file mode 100644 index 0000000000..b7b7cd98d8 --- /dev/null +++ b/server/auth/mit-kerberos/files/krb5-config_LDFLAGS.patch @@ -0,0 +1,11 @@ +--- src/build-tools/krb5-config.in.orig 2014-01-16 02:44:15.000000000 +0200 ++++ src/build-tools/krb5-config.in 2014-05-17 17:00:42.624580187 +0300 +@@ -221,7 +221,7 @@ + -e 's#\$(PROG_RPATH)#'$libdir'#' \ + -e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \ + -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \ +- -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \ ++ -e 's#\$(LDFLAGS)##' \ + -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \ + -e 's#\$(CFLAGS)##'` + diff --git a/server/auth/mit-kerberos/files/krb5.conf b/server/auth/mit-kerberos/files/krb5.conf new file mode 100644 index 0000000000..e68a5ccbbf --- /dev/null +++ b/server/auth/mit-kerberos/files/krb5.conf @@ -0,0 +1,25 @@ +[libdefaults] + ticket_lifetime = 600 + default_realm = EXAMPLE.COM + default_tkt_enctypes = des3-hmac-sha1 des-cbc-crc + default_tgs_enctypes = des3-hmac-sha1 des-cbc-crc + +[realms] + EXAMPLE.COM = { + kdc = kerberos.example.com:88 + kdc = kerberos2.example.com:88 + admin_server = kerberos.example.com:749 + } + +[domain_realm] + .example.com = EXAMPLE.COM + example.com = EXAMPLE.COM + +[kdc] + profile = /etc/krb5kdc/kdc.conf + +[logging] + kdc = FILE:/var/log/krb5kdc.log + admin_server = FILE:/var/log/kadmin.log + default = FILE:/var/log/krb5lib.log + diff --git a/server/auth/mit-kerberos/files/mit-krb5-1.12_uninitialized.patch b/server/auth/mit-kerberos/files/mit-krb5-1.12_uninitialized.patch new file mode 100644 index 0000000000..e779d364ec --- /dev/null +++ b/server/auth/mit-kerberos/files/mit-krb5-1.12_uninitialized.patch @@ -0,0 +1,55 @@ +--- a/src/slave/kprop.c ++++ b/src/slave/kprop.c +@@ -91,7 +91,7 @@ main(argc, argv) + int argc; + char **argv; + { +- int fd, database_fd, database_size; ++ int fd = -1, database_fd, database_size; + krb5_error_code retval; + krb5_context context; + krb5_creds *my_creds; +--- a/src/kadmin/ktutil/ktutil_funcs.c ++++ b/src/kadmin/ktutil/ktutil_funcs.c +@@ -64,7 +64,7 @@ + krb5_kt_list *list; + int idx; + { +- krb5_kt_list lp, prev; ++ krb5_kt_list lp, prev = NULL; + int i; + + for (lp = *list, i = 1; lp; prev = lp, lp = lp->next, i++) { +--- a/src/lib/kadm5/alt_prof.c ++++ b/src/lib/kadm5/alt_prof.c +@@ -164,7 +164,7 @@ + char **values; + char *valp; + int idx; +- krb5_boolean val; ++ krb5_boolean val = 0; + + kret = krb5_aprof_getvals (acontext, hierarchy, &values); + if (kret) + +--- a/src/util/profile/prof_init.c ++++ b/src/util/profile/prof_init.c +@@ -255,7 +255,7 @@ copy_vtable_profile(profile_t profile, profile_t *ret_new_profile) + { + errcode_t err; + void *cbdata; +- profile_t new_profile; ++ profile_t new_profile = NULL; + + *ret_new_profile = NULL; + +--- a/src/tests/asn.1/trval.c 2013-04-12 12:51:36.000000000 -0500 ++++ b/src/tests/asn.1/trval.c 2013-05-24 04:31:14.077036380 -0500 +@@ -404,7 +404,7 @@ + { + int n; + int r = 0; +- int rlen2; ++ int rlen2 = 0; + int rlent; + int save_appl; \ No newline at end of file diff --git a/server/auth/mit-kerberos/files/rebuild-configure-scripts.patch b/server/auth/mit-kerberos/files/rebuild-configure-scripts.patch new file mode 100644 index 0000000000..36b38118df --- /dev/null +++ b/server/auth/mit-kerberos/files/rebuild-configure-scripts.patch @@ -0,0 +1,12 @@ +--- /dev/null 2009-10-20 19:31:44.183325514 +0300 ++++ src/rebuild-configure-scripts.sh 2009-10-22 10:37:14.583117034 +0300 +@@ -0,0 +1,9 @@ ++#!/bin/bash ++ ++top=`pwd` ++for configurein in `find -name configure.in -type f` ; do ++ pushd `dirname $configurein` ++ grep -q A._CONFIG_HEADER configure.in && autoheader -I "$top" ++ autoconf -I "$top" ++ popd ++done diff --git a/server/auth/mit-kerberos/pspec.xml b/server/auth/mit-kerberos/pspec.xml new file mode 100644 index 0000000000..ed87ae8e84 --- /dev/null +++ b/server/auth/mit-kerberos/pspec.xml @@ -0,0 +1,106 @@ + + + + + mit-kerberos + http://web.mit.edu/kerberos/www/ + + PisiLinux Community + admins@pisilinux.org + + as-is + library + app:console + MIT Kerberos Library + Kerberos is a network authentication protocol. It is designed to provide strong authentication for client/server applications by using secret-key cryptography. + http://source.pisilinux.org/1.0/krb5-1.13.1.tar.gz + + + keyutils + openssl-devel + e2fsprogs-devel + + + + + krb5-config_LDFLAGS.patch + + rebuild-configure-scripts.patch + fix-python-detection.patch + + + + + mit-kerberos + + keyutils + openssl + e2fsprogs + + + + /etc + /usr/include + /usr/bin + /usr/sbin + /usr/lib + /usr/share + /var/lib + /usr/share/info + /usr/share/man + + + krb5.conf + kdc.conf + + + + + + 2015-04-23 + 1.13.1 + Version bump,fix deps. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-12-13 + 1.13 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-05-17 + 1.12.1 + Version bump. + Alihan Öztürk + alihan@pisilinux.org + + + 2014-01-22 + 1.11.4 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-02-20 + 1.11 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-09-27 + 1.10.3 + First release + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + diff --git a/server/auth/mit-kerberos/translations.xml b/server/auth/mit-kerberos/translations.xml new file mode 100644 index 0000000000..4ead7d5303 --- /dev/null +++ b/server/auth/mit-kerberos/translations.xml @@ -0,0 +1,8 @@ + + + + mit-kerberos + MIT Kerberos kütüphanesi + Kerberos bir ağ doğrulama protokolüdür. Sunucu/istemci uygulamalarında, gizli anahtar kriptoloji teknolojisini kullanarak, güçlü bir doğrulama sağlar. + + diff --git a/util/crypt/keyutils/actions.py b/util/crypt/keyutils/actions.py new file mode 100644 index 0000000000..f022cc41c1 --- /dev/null +++ b/util/crypt/keyutils/actions.py @@ -0,0 +1,17 @@ +#!/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 build(): + autotools.make("NO_ARLIB=1 LIBDIR=/lib USRLIBDIR=/usr/lib NO_GLIBC_KEYERR=1 CFLAGS=\"%s\"" % get.CFLAGS()) + +def install(): + autotools.install("NO_ARLIB=1 LIBDIR=/lib USRLIBDIR=/usr/lib DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("LICENCE.GPL", "LICENCE.LGPL", "README") diff --git a/util/crypt/keyutils/pspec.xml b/util/crypt/keyutils/pspec.xml new file mode 100644 index 0000000000..428902eecd --- /dev/null +++ b/util/crypt/keyutils/pspec.xml @@ -0,0 +1,65 @@ + + + + + keyutils + http://people.redhat.com/~dhowells/keyutils/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2+ + LGPLv2+ + library + app:console + Linux key management utilities + keyutils contains utilities to control the kernel key management facility and to provide a mechanism by which the kernel call back to userspace to get a key instantiated. + http://people.redhat.com/~dhowells/keyutils/keyutils-1.5.9.tar.bz2 + + + + keyutils + + /etc + /bin + /sbin + /usr/include + /usr/lib + /lib + /usr/share/man + /usr/share/doc + /usr/share/keyutils + + + + + + 2014-05-22 + 1.5.9 + Rebuild. + Kamil Atlı + suvarice@gmail.com + + + 2014-04-03 + 1.5.9 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-13 + 1.5.8 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2010-10-12 + 1.5.5 + First release + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + diff --git a/util/crypt/keyutils/translations.xml b/util/crypt/keyutils/translations.xml new file mode 100644 index 0000000000..0c34ecbe0c --- /dev/null +++ b/util/crypt/keyutils/translations.xml @@ -0,0 +1,9 @@ + + + + keyutils + Linux anahtar yönetim araçları + keyutils, Linux çekirdeğindeki anahtar yönetim kolaylıklarını denetlemek ve çekirdek ile kullanıcı uzayı arasında iletişim kurmak için gereken araçları içerir. + + +