From 70203a07239213d60165ba9b2d3e4386c99a510c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 2 Dec 2008 14:30:31 +0000 Subject: Move pam, packagekit, monit and gnet to meta-moblin --- meta-moblin/packages/gnet/files/buildfix.patch | 13 +++++ .../packages/gnet/files/configure_fix.patch | 58 ++++++++++++++++++++++ .../packages/gnet/files/pkgconfig_fix.patch | 12 +++++ meta-moblin/packages/gnet/gnet_svn.bb | 24 +++++++++ meta-moblin/packages/monit/monit-4.10.1/init | 42 ++++++++++++++++ meta-moblin/packages/monit/monit_4.10.1.bb | 24 +++++++++ .../packages/packagekit/files/no_validate.patch | 21 ++++++++ .../packages/packagekit/packagekit_0.3.8.bb | 12 +++++ .../packages/pam/files/disable_crossbinary.patch | 34 +++++++++++++ meta-moblin/packages/pam/pam_1.0.2.bb | 29 +++++++++++ 10 files changed, 269 insertions(+) create mode 100644 meta-moblin/packages/gnet/files/buildfix.patch create mode 100644 meta-moblin/packages/gnet/files/configure_fix.patch create mode 100644 meta-moblin/packages/gnet/files/pkgconfig_fix.patch create mode 100644 meta-moblin/packages/gnet/gnet_svn.bb create mode 100644 meta-moblin/packages/monit/monit-4.10.1/init create mode 100644 meta-moblin/packages/monit/monit_4.10.1.bb create mode 100644 meta-moblin/packages/packagekit/files/no_validate.patch create mode 100644 meta-moblin/packages/packagekit/packagekit_0.3.8.bb create mode 100644 meta-moblin/packages/pam/files/disable_crossbinary.patch create mode 100644 meta-moblin/packages/pam/pam_1.0.2.bb (limited to 'meta-moblin') diff --git a/meta-moblin/packages/gnet/files/buildfix.patch b/meta-moblin/packages/gnet/files/buildfix.patch new file mode 100644 index 0000000000..8067620264 --- /dev/null +++ b/meta-moblin/packages/gnet/files/buildfix.patch @@ -0,0 +1,13 @@ +Index: gnet/examples/Makefile.am +=================================================================== +--- gnet.orig/examples/Makefile.am ++++ gnet/examples/Makefile.am +@@ -2,7 +2,7 @@ + + @SET_MAKE@ + +-SUBDIRS = xmlrpc ++SUBDIRS = + + if OS_WIN32 + noinst_PROGRAMS = echoclient echoserver \ diff --git a/meta-moblin/packages/gnet/files/configure_fix.patch b/meta-moblin/packages/gnet/files/configure_fix.patch new file mode 100644 index 0000000000..e6aadcc6a9 --- /dev/null +++ b/meta-moblin/packages/gnet/files/configure_fix.patch @@ -0,0 +1,58 @@ +Index: trunk/configure.ac +=================================================================== +--- trunk.orig/configure.ac ++++ trunk/configure.ac +@@ -332,53 +332,6 @@ AC_DEFINE_UNQUOTED(GNET_SOCKADDR_FAMILY_ + [$gnet_sockaddr_family_field_name], + [Name of sockaddr_storage family field]) + +-dnl ####################################### +-dnl Check if abstract sockets are supported +-dnl ####################################### +- +-AC_LANG_PUSH(C) +-AC_CACHE_CHECK([for abstract socket namespace availability], +- ac_cv_gnet_have_abstract_sockets, +- [AC_RUN_IFELSE([AC_LANG_PROGRAM( +-[[ +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-]], +-[[ +- int listen_fd, len; +- struct sockaddr_un addr; +- +- listen_fd = socket (PF_UNIX, SOCK_STREAM, 0); +- if (listen_fd < 0) { +- perror ("socket() failed: "); +- exit (1); +- } +- memset (&addr, '\0', sizeof (addr)); +- addr.sun_family = AF_UNIX; +- strcpy (addr.sun_path, "X/tmp/gnet-fake-socket-path-used-in-configure-test"); +- len = SUN_LEN (&addr); /* calculate size before adding the \0 */ +- addr.sun_path[0] = '\0'; /* this is what makes it abstract */ +- +- if (bind (listen_fd, (struct sockaddr*) &addr, len) < 0) { +- perror ("Abstract socket namespace bind() failed: "); +- exit (1); +- } +- exit (0); +-]])], +- [ac_cv_gnet_have_abstract_sockets=yes], +- [ac_cv_gnet_have_abstract_sockets=no] +-)]) +-AC_LANG_POP(C) +- +-if test x$ac_cv_gnet_have_abstract_sockets = xyes ; then +- AC_DEFINE(HAVE_ABSTRACT_SOCKETS,1,[Have abstract socket namespace]) +-fi +- + ############################### + # Compiler characteristics + AC_C_CONST diff --git a/meta-moblin/packages/gnet/files/pkgconfig_fix.patch b/meta-moblin/packages/gnet/files/pkgconfig_fix.patch new file mode 100644 index 0000000000..a4a433f1ce --- /dev/null +++ b/meta-moblin/packages/gnet/files/pkgconfig_fix.patch @@ -0,0 +1,12 @@ +Index: trunk/gnet-2.0.pc.in +=================================================================== +--- trunk.orig/gnet-2.0.pc.in 2008-11-06 16:41:25.000000000 +0000 ++++ trunk/gnet-2.0.pc.in 2008-11-06 16:42:23.000000000 +0000 +@@ -6,5 +6,6 @@ + Name: Gnet + Description: A network compatibility layer library + Version: @VERSION@ ++Requires: glib-2.0 gthread-2.0 + Libs: -L${libdir} -lgnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@ @GLIB_LIBS@ @GTHREAD_LIBS@ +-Cflags: -I${includedir}/gnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@ -I${libdir}/gnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@/include/ @GLIB_CFLAGS@ @GTHREAD_CFLAGS@ ++Cflags: -I${includedir}/gnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@ -I${libdir}/gnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@/include/ diff --git a/meta-moblin/packages/gnet/gnet_svn.bb b/meta-moblin/packages/gnet/gnet_svn.bb new file mode 100644 index 0000000000..e9ee15531e --- /dev/null +++ b/meta-moblin/packages/gnet/gnet_svn.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "GNet is a simple network library. It is written in C, object-oriented, and built upon GLib." +LICENSE = "LGPL" +SECTION = "libs/network" +HOMEPAGE = "http://www.gnetlibrary.org" +DEPENDS = "glib-2.0" +PV = "2.0.7+svnr${SRCREV}" +PR = "r1" + +SRC_URI = "svn://svn.gnome.org/svn/${PN}/;module=trunk;proto=http \ + file://buildfix.patch;patch=1 \ + file://configure_fix.patch;patch=1 \ + file://pkgconfig_fix.patch;patch=1 " + +S = "${WORKDIR}/trunk" + +EXTRA_OECONF = "--disable-pthreads" + +FILES_${PN}-dev += "${libdir}/gnet-2.0" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/meta-moblin/packages/monit/monit-4.10.1/init b/meta-moblin/packages/monit/monit-4.10.1/init new file mode 100644 index 0000000000..325a552b28 --- /dev/null +++ b/meta-moblin/packages/monit/monit-4.10.1/init @@ -0,0 +1,42 @@ +#! /bin/sh +# +# This is an init script for openembedded +# Copy it to /etc/init.d/monit and type +# > update-rc.d monit defaults 99 +# +monit=/usr/bin/monit +pidfile=/var/run/monit.pid +monit_args="-c /etc/monitrc" + +test -x "$monit" || exit 0 + +case "$1" in + start) + echo -n "Starting Monit" + start-stop-daemon --start --quiet --exec $monit -- $monit_args + RETVAL=$? + echo "." + ;; + stop) + echo -n "Stopping Monit" + start-stop-daemon --stop --quiet --pidfile $pidfile + RETVAL=$? + echo "." + ;; + restart) + $0 stop + $0 start + RETVAL=$? + ;; + status) + $monit $monit_args status + RETVAL=$? + echo "." + ;; + *) + echo "Usage: $0 {start|stop|restart|status}" + exit 1 +esac + +exit $RETVAL + diff --git a/meta-moblin/packages/monit/monit_4.10.1.bb b/meta-moblin/packages/monit/monit_4.10.1.bb new file mode 100644 index 0000000000..bb18491c5d --- /dev/null +++ b/meta-moblin/packages/monit/monit_4.10.1.bb @@ -0,0 +1,24 @@ +LICENSE = "GPL" +DEPENDS = "openssl" + +SRC_URI = "http://www.tildeslash.com/monit/dist/monit-${PV}.tar.gz\ + file://init" + +INITSCRIPT_NAME = "monit" +INITSCRIPT_PARAMS = "defaults 99" + +inherit autotools update-rc.d + +EXTRA_OECONF = "--with-ssl-lib-dir=${STAGING_LIBDIR} --with-ssl-incl-dir=${STAGING_INCDIR}" + +do_install_append() { + install -d ${D}${sysconfdir}/init.d/ + install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/monit + sed -i 's:# set daemon 120:set daemon 120:' ${S}/monitrc + sed -i 's:include /etc/monit.d/:include /${sysconfdir}/monit.d/:' ${S}/monitrc + install -m 600 ${S}/monitrc ${D}${sysconfdir}/monitrc + install -m 700 -d ${D}${sysconfdir}/monit.d/ +} + +CONFFILES_${PN} += "${sysconfdir}/monitrc" + diff --git a/meta-moblin/packages/packagekit/files/no_validate.patch b/meta-moblin/packages/packagekit/files/no_validate.patch new file mode 100644 index 0000000000..f987b567df --- /dev/null +++ b/meta-moblin/packages/packagekit/files/no_validate.patch @@ -0,0 +1,21 @@ +Index: PackageKit-0.3.8/configure.ac +=================================================================== +--- PackageKit-0.3.8.orig/configure.ac 2008-11-04 21:37:17.000000000 +0000 ++++ PackageKit-0.3.8/configure.ac 2008-11-04 21:37:57.000000000 +0000 +@@ -451,11 +451,11 @@ + polkit-grant >= $POLKIT_GRANT_REQUIRED) + AC_SUBST(POLKIT_CFLAGS) + AC_SUBST(POLKIT_LIBS) +- AC_CHECK_PROG([POLKIT_POLICY_FILE_VALIDATE], +- [polkit-policy-file-validate], [polkit-policy-file-validate]) +- if test -z "$POLKIT_POLICY_FILE_VALIDATE"; then +- AC_MSG_ERROR([polkit-policy-file-validate not found]) +- fi ++ #AC_CHECK_PROG([POLKIT_POLICY_FILE_VALIDATE], ++ # [polkit-policy-file-validate], [polkit-policy-file-validate]) ++ #if test -z "$POLKIT_POLICY_FILE_VALIDATE"; then ++ # AC_MSG_ERROR([polkit-policy-file-validate not found]) ++ #fi + AC_DEFINE(USE_SECURITY_POLKIT, 1, [if we should use PolicyKit]) + elif test x$with_security_framework = xdummy; then + AC_DEFINE(USE_SECURITY_DUMMY, 1, [if we should use a dummy security framework]) diff --git a/meta-moblin/packages/packagekit/packagekit_0.3.8.bb b/meta-moblin/packages/packagekit/packagekit_0.3.8.bb new file mode 100644 index 0000000000..a38f53685b --- /dev/null +++ b/meta-moblin/packages/packagekit/packagekit_0.3.8.bb @@ -0,0 +1,12 @@ +HOMEPAGE = "http://www.packagekit.org/" +PR = "r6" + +SRC_URI = "http://www.packagekit.org/releases/PackageKit-0.3.8.tar.gz \ + file://no_validate.patch;patch=1 " + +DEPENDS = "python policykit pam" +EXTRA_OECONF = "--disable-qt --disable-tests --enable-yum --with-default-backend=yum --disable-local --with-security-framework=polkit --disable-gstreamer-plugin" + +S = "${WORKDIR}/PackageKit-${PV}" + +inherit autotools pkgconfig diff --git a/meta-moblin/packages/pam/files/disable_crossbinary.patch b/meta-moblin/packages/pam/files/disable_crossbinary.patch new file mode 100644 index 0000000000..43359b08fe --- /dev/null +++ b/meta-moblin/packages/pam/files/disable_crossbinary.patch @@ -0,0 +1,34 @@ +padout should be compiled using the native compiler but isn't. +Disable this piece of documentation for now. + +RP + +Index: Linux-PAM-1.0.2/doc/specs/Makefile.am +=================================================================== +--- Linux-PAM-1.0.2.orig/doc/specs/Makefile.am 2008-11-04 21:06:23.000000000 +0000 ++++ Linux-PAM-1.0.2/doc/specs/Makefile.am 2008-11-04 21:07:06.000000000 +0000 +@@ -2,21 +2,8 @@ + # Copyright (c) 2005, 2006 Thorsten Kukuk + # + +-CLEANFILES = draft-morgan-pam-current.txt *~ ++CLEANFILES = *~ + +-EXTRA_DIST = draft-morgan-pam.raw std-agent-id.raw rfc86.0.txt ++EXTRA_DIST = std-agent-id.raw rfc86.0.txt + +-draft-morgan-pam-current.txt: padout draft-morgan-pam.raw +- ./padout < $(srcdir)/draft-morgan-pam.raw > draft-morgan-pam-current.txt +- +-AM_YFLAGS = -d +- +-BUILT_SOURCES = parse_y.h +- +-noinst_PROGRAMS = padout +- +-padout_SOURCES = parse_l.l parse_y.y +- +-padout_LDADD = @LEXLIB@ +- +-doc_DATA = draft-morgan-pam-current.txt rfc86.0.txt ++doc_DATA = rfc86.0.txt diff --git a/meta-moblin/packages/pam/pam_1.0.2.bb b/meta-moblin/packages/pam/pam_1.0.2.bb new file mode 100644 index 0000000000..2a91414d7e --- /dev/null +++ b/meta-moblin/packages/pam/pam_1.0.2.bb @@ -0,0 +1,29 @@ +HOMEPAGE = "http://www.kernel.org/pub/linux/libs/pam/" +PR = "r7" + +SRC_URI = "http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-1.0.2.tar.bz2 \ + file://disable_crossbinary.patch;patch=1 " + +EXTRA_OECONF = "--with-db-uniquename=_pam \ + --includedir=${includedir}/security \ + --libdir=/lib" +DEPENDS = "bison flex" +CFLAGS_append = " -fPIC " + +S = "${WORKDIR}/Linux-PAM-${PV}" + +inherit autotools pkgconfig + + +do_stage() { + autotools_stage_all +} + +FILES_${PN}-dbg += "${base_libdir}/security/.debug" +FILES_${PN}-dbg += "${base_libdir}/security/pam_filter/.debug" +FILES_${PN} += "${base_libdir}/security/*.so" +FILES_${PN} += "${base_libdir}/security/pam_filter/upperLOWER" +FILES_${PN} += "${base_libdir}/security/*.so" +FILES_${PN}-dev += "${base_libdir}/security/*.la" +FILES_${PN}-dev += "${base_libdir}/*.la" +FILES_${PN} += "${base_libdir}/*.so*" -- cgit v1.2.3-54-g00ecf