From 814ae94b92cf9ba9dceb1b70e2af58680a7eaab7 Mon Sep 17 00:00:00 2001 From: Tim 'timtim' Ellis Date: Sat, 14 Feb 2009 19:21:42 +0000 Subject: libv4l: 0.5.7.bb -> 0.5.8 --- packages/v4l2apps/libv4l_0.5.7.bb | 16 ---------------- packages/v4l2apps/libv4l_0.5.8.bb | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 packages/v4l2apps/libv4l_0.5.7.bb create mode 100644 packages/v4l2apps/libv4l_0.5.8.bb diff --git a/packages/v4l2apps/libv4l_0.5.7.bb b/packages/v4l2apps/libv4l_0.5.7.bb deleted file mode 100644 index a53c52f223..0000000000 --- a/packages/v4l2apps/libv4l_0.5.7.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "libv4l is a collection of libraries which adds a thin abstraction layer on top of video4linux2 devices." -LICENSE = "LGPLv2" - -SRC_URI = "http://people.atrpms.net/~hdegoede/libv4l-${PV}.tar.gz" - -inherit pkgconfig - -export PREFIX="${prefix}" - -do_install() { - oe_runmake DESTDIR="${D}" install -} - -do_stage() { - oe_runmake DESTDIR="${STAGING_DIR_TARGET}" install -} diff --git a/packages/v4l2apps/libv4l_0.5.8.bb b/packages/v4l2apps/libv4l_0.5.8.bb new file mode 100644 index 0000000000..a53c52f223 --- /dev/null +++ b/packages/v4l2apps/libv4l_0.5.8.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "libv4l is a collection of libraries which adds a thin abstraction layer on top of video4linux2 devices." +LICENSE = "LGPLv2" + +SRC_URI = "http://people.atrpms.net/~hdegoede/libv4l-${PV}.tar.gz" + +inherit pkgconfig + +export PREFIX="${prefix}" + +do_install() { + oe_runmake DESTDIR="${D}" install +} + +do_stage() { + oe_runmake DESTDIR="${STAGING_DIR_TARGET}" install +} -- cgit v1.2.3 From db98888b0fdec6cc0fce147088ad10eef34f1bc5 Mon Sep 17 00:00:00 2001 From: Tim 'timtim' Ellis Date: Sat, 14 Feb 2009 19:23:49 +0000 Subject: checksums.ini: Add libv4l 0.5.8 --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index f078768161..5d3e628ab4 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -13390,6 +13390,10 @@ sha256=69ad5d62946885a60368381a3354b8fd19597bc6fc9ee25b4598977771429b8d md5=a5056dcf337e240e5370984f95d9ad68 sha256=676840669a82763ccc7b46ba033a6a01df815c46486f7b30916951769331b6d6 +[http://people.atrpms.net/~hdegoede/libv4l-0.5.8.tar.gz] +md5=4f8ae9c743b215c8ac0e553eaa01e980 +sha256=9d006377ec51ca149ed415fbea5c3298b0fe7bae4cbd3bc2f54fd25a24ed9eb2 + [http://downloads.sourceforge.net/libvisual/libvisual-0.1.3.tar.gz] md5=e70e91d2e90831c0eb78944b6a9605ef sha256=fc04f2f2bae4b3eef7eb331330e2e3fd336d1894dbf4cae631c8b635622cdd52 -- cgit v1.2.3 From 51fb74e2857910bc85c2dcf88b15d2e2707b743e Mon Sep 17 00:00:00 2001 From: Lynn Lin Date: Sat, 14 Feb 2009 14:11:58 -0800 Subject: Signed-off-by: Khem Raj libssh_0.2.bb: New recipe libssh_0.11.bb: Reduce priority so that libssh_0.2.bb can be picked up. * Some how oe_runmake called with make -j4 did not work for me thats why I used non parallel make. --- conf/checksums.ini | 4 ++++ packages/libssh/files/libssh_libdir_fix.patch | 13 +++++++++++++ packages/libssh/libssh_0.11.bb | 2 ++ packages/libssh/libssh_0.2.bb | 28 +++++++++++++++++++++++++++ 4 files changed, 47 insertions(+) create mode 100644 packages/libssh/files/libssh_libdir_fix.patch create mode 100644 packages/libssh/libssh_0.2.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 5d3e628ab4..ed910b6651 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -13142,6 +13142,10 @@ sha256=8b4ebd22dcfa7511109c2f6fa9e304c2ef3acaa492d55423cdf9a6f54a2fdb22 md5=ad703c4702646c83ca4fcace92c220d3 sha256=94ca32ac10615a7c0ba19180e67f2e40e2bfa4cc8de6ceb2a3a54d2dd83141cb +[http://www.0xbadc0de.be/libssh/libssh-0.2.tgz] +md5=8a76c03579a3e27046e6bafe88ffd171 +sha256=46c3831fd563c54283ebef56e2cb11c27f47b1be9f6cb44f1465897dd7aea5ff + [http://snowball.tartarus.org/dist/libstemmer_c.tgz] md5=8358a9ddaaffeeca7cb00725770f7cdb sha256=f3e93a41ad76e91f08e3115fa5065df8b69fd3f2dbdd9e982ae890b892ac6477 diff --git a/packages/libssh/files/libssh_libdir_fix.patch b/packages/libssh/files/libssh_libdir_fix.patch new file mode 100644 index 0000000000..a9fcce79e3 --- /dev/null +++ b/packages/libssh/files/libssh_libdir_fix.patch @@ -0,0 +1,13 @@ +diff -NurpP --minimal libssh-0.2/libssh/Makefile.in libssh-0.2-libdir/libssh/Makefile.in +--- libssh-0.2/libssh/Makefile.in 2006-12-29 23:03:59.000000000 +0800 ++++ libssh-0.2-libdir/libssh/Makefile.in 2008-10-13 10:04:13.000000000 +0800 +@@ -15,7 +15,7 @@ exec_prefix = @exec_prefix@ + bindir = $(exec_prefix)/bin + incldir= $(prefix)/include + infodir = $(prefix)/info +-libdir = $(prefix)/lib/ ++libdir = $(prefix)/lib + mandir = $(prefix)/man/man1 + + CC = @CC@ + diff --git a/packages/libssh/libssh_0.11.bb b/packages/libssh/libssh_0.11.bb index ab6949f409..833567ebb0 100644 --- a/packages/libssh/libssh_0.11.bb +++ b/packages/libssh/libssh_0.11.bb @@ -6,6 +6,8 @@ includes SFTP support, and a sample SSH client is provided." DEPENDS = "openssl" LICENSE = "LGPL" +DEFAULT_PREFERENCE="-1" + SRC_URI = "http://www.0xbadc0de.be/libssh/libssh-${PV}.tgz" inherit autotools diff --git a/packages/libssh/libssh_0.2.bb b/packages/libssh/libssh_0.2.bb new file mode 100644 index 0000000000..b776094018 --- /dev/null +++ b/packages/libssh/libssh_0.2.bb @@ -0,0 +1,28 @@ +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "The SSH library is a C library to authenticate in a \ +simple manner to one or more SSH servers. The goal of this project \ +is to provide a library much simpler to use than OpenSSHs one. It \ +includes SFTP support, and a sample SSH client is provided." + +HOMEPAGE = "http://0xbadc0de.be/wiki/libssh:libssh" +LICENSE = "LGPL" +SECTION = "libs" +DEPENDS = "openssl" +SRC_URI = "http://www.0xbadc0de.be/libssh/libssh-${PV}.tgz \ + file://libssh_libdir_fix.patch;patch=1 \ + " +inherit autotools + +EXTRA_OECONF = "--cache-file=${S}/config.cache" +do_compile () { + oenote make "$@" + make "$@" || die "oe_runmake failed" +} +do_stage () { + install -d ${STAGING_INCDIR}/libssh + for i in crypto.h libssh.h sftp.h ssh2.h; do + install -m 0644 ${S}/include/libssh/$i ${STAGING_INCDIR}/libssh/ + done + oe_libinstall -so -C libssh libssh ${STAGING_LIBDIR} +} -- cgit v1.2.3 From 7ccad5b86ec86db48c16798f39ee70ce4281e056 Mon Sep 17 00:00:00 2001 From: Lynn Lin Date: Sat, 14 Feb 2009 14:28:18 -0800 Subject: Signed-off-by: Khem Raj checksums.ini: Add checksum for another debian mirror. --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index ed910b6651..b288310578 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -5258,6 +5258,10 @@ sha256=06c2772ae6e446227f6798ad8994fcdb1fe64385bc83a34f7e29fd8af2e4f5da md5=9441c981bfd4e521abcd5d93385f71d8 sha256=06c2772ae6e446227f6798ad8994fcdb1fe64385bc83a34f7e29fd8af2e4f5da +[http://ftp.pwr.wroc.pl/debian/pool//main/f/fakeroot/fakeroot_1.9.6.tar.gz] +md5=9441c981bfd4e521abcd5d93385f71d8 +sha256=06c2772ae6e446227f6798ad8994fcdb1fe64385bc83a34f7e29fd8af2e4f5da + [ftp://oss.sgi.com/projects/fam/download/stable/fam-2.6.10.tar.gz] md5=1c5a2ea659680bdd1e238d7828a857a7 sha256=885ced3480aef3cee519a459a572e31cd2fd5e24bcd35b1d0c8833361699026e -- cgit v1.2.3 From 4549df49dc7e4a34be6d91fc48b8d52c29879683 Mon Sep 17 00:00:00 2001 From: Lynn Lin Date: Sat, 14 Feb 2009 14:33:28 -0800 Subject: Signed-off-by: Khem Raj jlime-opie.bb: Replace task-bootstrap with task-base --- packages/images/jlime-opie.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/images/jlime-opie.bb b/packages/images/jlime-opie.bb index 7d98f98a32..bb9ad73f20 100644 --- a/packages/images/jlime-opie.bb +++ b/packages/images/jlime-opie.bb @@ -1,10 +1,11 @@ +PR = "r1" IMAGE_LINGUAS = "" -DEPENDS = "task-bootstrap task-opie" +DEPENDS = "task-base task-opie" extra_stuff = '${@base_conditional("ROOT_FLASH_SIZE", "24", "", "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles konqueror-embedded",d)}' -IMAGE_INSTALL = "task-bootstrap task-opie-base task-opie-base-applets \ +IMAGE_INSTALL = "task-base task-opie-base task-opie-base-applets \ task-opie-base-inputmethods task-opie-base-apps \ task-opie-base-settings task-opie-base-decorations \ task-opie-base-styles task-opie-base-pim \ -- cgit v1.2.3 From ab736f37e3e4ffc6ae9114fb50c2f505c2a7302d Mon Sep 17 00:00:00 2001 From: Claudio Mignanti Date: Sat, 14 Feb 2009 15:04:53 -0800 Subject: Signed-off-by: Khem Raj pax-utils: Add version 0.1.19 recipes and use gentoo mirror for sources. --- conf/checksums.ini | 8 ++++++++ packages/pax-utils/pax-utils-native_0.1.19.bb | 12 ++++++++++++ packages/pax-utils/pax-utils_0.1.13.bb | 4 ++-- packages/pax-utils/pax-utils_0.1.19.bb | 17 +++++++++++++++++ 4 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 packages/pax-utils/pax-utils-native_0.1.19.bb create mode 100644 packages/pax-utils/pax-utils_0.1.19.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index b288310578..2eda0dd673 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -16962,6 +16962,14 @@ sha256=72f3cdad93b5436070dcc63b67764a06c594f324ccc001e8bfb974a8d1a86f36 md5=5f09df47a16e83462384b44b75310539 sha256=72f3cdad93b5436070dcc63b67764a06c594f324ccc001e8bfb974a8d1a86f36 +[http://gentoo.osuosl.org/distfiles/pax-utils-0.1.13.tar.bz2] +md5=5f09df47a16e83462384b44b75310539 +sha256=72f3cdad93b5436070dcc63b67764a06c594f324ccc001e8bfb974a8d1a86f36 + +[http://gentoo.osuosl.org/distfiles/pax-utils-0.1.19.tar.bz2] +md5=98f6b9fe17a740a8cc577255422c6103 +sha256=3918628e9f2508708a1a28f5ed4cb39d07cbd5711747bbb3ddf63816d056c11e + [http://the.earth.li/pub/e3/pbltool-0.2.c] md5=c8fd507f831d2b017dfecf60bc55e28a sha256=2a1e31d4ae859e530895882273fad0170374a2d5b838bb4558303e59236e9cb6 diff --git a/packages/pax-utils/pax-utils-native_0.1.19.bb b/packages/pax-utils/pax-utils-native_0.1.19.bb new file mode 100644 index 0000000000..5a56c01aa4 --- /dev/null +++ b/packages/pax-utils/pax-utils-native_0.1.19.bb @@ -0,0 +1,12 @@ +inherit native + +require pax-utils_${PV}.bb + +do_stage() { + oe_runmake PREFIX=${STAGING_DIR_HOST}${layout_prefix} install +} + +do_install() { + : +} + diff --git a/packages/pax-utils/pax-utils_0.1.13.bb b/packages/pax-utils/pax-utils_0.1.13.bb index 9a350844d0..c704d288b8 100644 --- a/packages/pax-utils/pax-utils_0.1.13.bb +++ b/packages/pax-utils/pax-utils_0.1.13.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Various ELF utilities" HOMEPAGE = "http://www.gentoo.org/proj/en/hardened/pax-utils.xml" LICENSE = "GPLv2" - -SRC_URI = "http://dev.gentoo.org/~solar/pax/pax-utils-${PV}.tar.bz2" +PR = "r1" +SRC_URI = "http://gentoo.osuosl.org/distfiles/pax-utils-${PV}.tar.bz2" S = "${WORKDIR}/pax-utils-${PV}" CPPFLAGS += "-D_GNU_SOURCE " diff --git a/packages/pax-utils/pax-utils_0.1.19.bb b/packages/pax-utils/pax-utils_0.1.19.bb new file mode 100644 index 0000000000..bd657d7997 --- /dev/null +++ b/packages/pax-utils/pax-utils_0.1.19.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Various ELF utilities" +HOMEPAGE = "http://www.gentoo.org/proj/en/hardened/pax-utils.xml" +LICENSE = "GPLv2" + +SRC_URI = "http://gentoo.osuosl.org/distfiles/pax-utils-${PV}.tar.bz2" +S = "${WORKDIR}/pax-utils-${PV}" + +CPPFLAGS += "-D_GNU_SOURCE " + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake DESTDIR=${D} install +} + -- cgit v1.2.3 From 3e57b182e19ea69bb05f2622c3e367799d5d1c38 Mon Sep 17 00:00:00 2001 From: Gregoire Gentil Date: Sat, 14 Feb 2009 15:41:13 -0800 Subject: Signed-off-by: Khem Raj libosso_2.13.bb: Replace inline hidden attribute with static functions. --- .../maemo4/libosso/libosso-dont-use-inline.patch | 47 ++++++++++++++++++++++ packages/maemo4/libosso_2.13.bb | 3 +- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 packages/maemo4/libosso/libosso-dont-use-inline.patch diff --git a/packages/maemo4/libosso/libosso-dont-use-inline.patch b/packages/maemo4/libosso/libosso-dont-use-inline.patch new file mode 100644 index 0000000000..d3878308c2 --- /dev/null +++ b/packages/maemo4/libosso/libosso-dont-use-inline.patch @@ -0,0 +1,47 @@ +--- libosso-2.13/src/osso-init.c.orig 2008-09-22 12:56:49.000000000 -0700 ++++ libosso-2.13/src/osso-init.c 2008-09-22 12:57:22.000000000 -0700 +@@ -657,7 +657,8 @@ + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + } + +-inline int __attribute__ ((visibility("hidden"))) ++//inline int __attribute__ ((visibility("hidden"))) ++static int + muali_convert_msgtype(int t) + { + switch (t) { +--- libosso-2.13/src/osso-internal.h.orig 2008-09-22 12:57:39.000000000 -0700 ++++ libosso-2.13/src/osso-internal.h 2008-09-22 12:58:13.000000000 -0700 +@@ -209,7 +209,8 @@ + # define dprint(f, a...) + # endif /* LIBOSSO_DEBUG */ + +-inline int __attribute__ ((visibility("hidden"))) ++//inline int __attribute__ ((visibility("hidden"))) ++static int + muali_convert_msgtype(int t); + + muali_arg_t* _get_muali_args(DBusMessageIter *iter); +@@ -297,7 +298,8 @@ + _muali_parse_id(const char *id, muali_bus_type *bus, char *sender, + int *serial); + +-inline void __attribute__ ((visibility("hidden"))) ++//inline void __attribute__ ((visibility("hidden"))) ++static void + _muali_make_id(muali_bus_type bus, const char *sender, int serial, char *id); + + #endif /* OSSO_INTERNAL_H_ */ +--- libosso-2.13/src/osso-rpc.c.orig 2008-09-22 12:58:53.000000000 -0700 ++++ libosso-2.13/src/osso-rpc.c 2008-09-22 12:59:42.000000000 -0700 +@@ -1026,7 +1026,8 @@ + *serial = atoi(buf); + } + +-inline void __attribute__ ((visibility("hidden"))) ++//inline void __attribute__ ((visibility("hidden"))) ++static void + _muali_make_id(muali_bus_type bus, const char *sender, int serial, char *id) + { + snprintf(id, MAX_MSGID_LEN, "%d,%s,%d", bus, sender, serial); + diff --git a/packages/maemo4/libosso_2.13.bb b/packages/maemo4/libosso_2.13.bb index 1920e29d3a..25ee9aac15 100644 --- a/packages/maemo4/libosso_2.13.bb +++ b/packages/maemo4/libosso_2.13.bb @@ -1,10 +1,11 @@ require libosso.inc -PR = "r0" +PR = "r1" SRC_URI = "\ http://repository.maemo.org/pool/maemo4.0/free/source/libo/${PN}/${PN}_${PV}-1.1fix.tar.gz \ file://libosso-buildfix.patch;patch=1 \ + file://libosso-dont-use-inline.patch;patch=1 \ " PACKAGES += "${PN}-outo ${PN}-outo-dev ${PN}-outo-dbg ${PN}-outo-bin-dbg ${PN}-outo-bin" -- cgit v1.2.3 From fef3375fcfc10d047f7b54416ee19062f78ae07b Mon Sep 17 00:00:00 2001 From: Lynn Lin Date: Sat, 14 Feb 2009 18:35:07 -0800 Subject: Signed-off-by: Khem Raj mini-httpd: New recipe. --- conf/checksums.ini | 4 ++ packages/mini-httpd/.mini-httpd_1.19.bb.swp | Bin 0 -> 12288 bytes packages/mini-httpd/files/init | 70 ++++++++++++++++++++++ packages/mini-httpd/files/mini-httpd.conf | 37 ++++++++++++ packages/mini-httpd/files/new-bindir-mandir.patch | 15 +++++ packages/mini-httpd/files/remove-CC.patch | 13 ++++ packages/mini-httpd/mini-httpd_1.19.bb | 36 +++++++++++ 7 files changed, 175 insertions(+) create mode 100644 packages/mini-httpd/.mini-httpd_1.19.bb.swp create mode 100644 packages/mini-httpd/files/init create mode 100644 packages/mini-httpd/files/mini-httpd.conf create mode 100644 packages/mini-httpd/files/new-bindir-mandir.patch create mode 100644 packages/mini-httpd/files/remove-CC.patch create mode 100644 packages/mini-httpd/mini-httpd_1.19.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 2eda0dd673..2aee8cc431 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -14966,6 +14966,10 @@ sha256=64d7c31354d318ec2085e39e724287c78742a66302fd0b27dab7a3f705d5c54d md5=7e192e01b08023c7f3e63bf1c796bc14 sha256=68c64a38f0b29347f86871248f0399e7e1b12645dc6263af7b2e4940f1392eaa +[http://www.acme.com/software/mini_httpd/mini_httpd-1.19.tar.gz] +md5=7c68293ad265ecfe2edea917912f6f1f +sha256=f7f36533b1338ea16d916ea525ea7006ab38fdd3544ac7df93a4688a8e270241 + [http://gpe.linuxtogo.org/download/source/miniclipboard-0.3.tar.gz] md5=8bea461bf4136aedbe110b6aec184d72 sha256=7f9c937c0f04760d215f7e7d9ca2709f8148e69be2693206d1ae81e2c88a656e diff --git a/packages/mini-httpd/.mini-httpd_1.19.bb.swp b/packages/mini-httpd/.mini-httpd_1.19.bb.swp new file mode 100644 index 0000000000..d384577124 Binary files /dev/null and b/packages/mini-httpd/.mini-httpd_1.19.bb.swp differ diff --git a/packages/mini-httpd/files/init b/packages/mini-httpd/files/init new file mode 100644 index 0000000000..5e9b176eb9 --- /dev/null +++ b/packages/mini-httpd/files/init @@ -0,0 +1,70 @@ +#! /bin/sh + +# Globals +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/mini_httpd +NAME=mini-httpd +DESC="web server" +# Additional options that are passed to the Daemon. +DAEMON_OPTS="-C /etc/mini-httpd.conf" + +test -x $DAEMON || exit 0 + +# Include mini-httpd defaults if available +if [ -f /etc/default/mini-httpd ] +then + . /etc/default/mini-httpd +fi + +set -e + +case "$1" in + start) + echo -n "Starting $DESC: " + start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \ + --exec $DAEMON -- $DAEMON_OPTS + echo "$NAME." + ;; + + stop) + echo -n "Stopping $DESC: " + # Get pid number + if [ -e /var/run/$NAME.pid ] + then + PID=`cat /var/run/$NAME.pid` + if [ -d /proc/$PID ] + then + start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid + else + # we need to remove the pidfile manually + if [ -e /var/run/$NAME.pid ] + then + rm -f /var/run/$NAME.pid + fi + fi + fi + echo "$NAME." + ;; + + restart|force-reload) + echo -n "Restarting $DESC: " + if [ "$START" = "0" ] + then + start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \ + --exec $DAEMON -- $DAEMON_OPTS + fi + sleep 1 + start-stop-daemon --start --quiet --pidfile \ + /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS + echo "$NAME." + ;; + + *) + N=/etc/init.d/$NAME + echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 + diff --git a/packages/mini-httpd/files/mini-httpd.conf b/packages/mini-httpd/files/mini-httpd.conf new file mode 100644 index 0000000000..cb4150c3d9 --- /dev/null +++ b/packages/mini-httpd/files/mini-httpd.conf @@ -0,0 +1,37 @@ +# Example config for mini_httpd. +# Author: Marvin Stark + +# Uncomment this line for turning on ssl support. +#ssl + +# On which host mini_httpd should bind? +host=0.0.0.0 + +# On which port mini_httpd should listen? +port=80 + +# Which user mini_httpd should use? +user=nobody + +# Run in chroot mode? +#chroot # yes +nochroot # no + +# Working directory of mini_httpd. +#dir= + +# We are the web files stored? +data_dir=/etc/mini-httpd + +# Which certificate to use? +#certfile= + +# Which logfile to use? +logfile=/var/log/mini-httpd.log + +# Which pidfile to use? +pidfile=/var/run/mini-httpd.pid + +# Which charset to use? +charset=iso-8859-1 + diff --git a/packages/mini-httpd/files/new-bindir-mandir.patch b/packages/mini-httpd/files/new-bindir-mandir.patch new file mode 100644 index 0000000000..7d48cd1685 --- /dev/null +++ b/packages/mini-httpd/files/new-bindir-mandir.patch @@ -0,0 +1,15 @@ +diff -NurpP --minimal mini_httpd-1.19/Makefile mini_httpd-1.19-new/Makefile +--- mini_httpd-1.19/Makefile 2002-11-02 07:02:57.000000000 +0800 ++++ mini_httpd-1.19-new/Makefile 2008-10-06 15:43:52.000000000 +0800 +@@ -20,8 +20,8 @@ CRYPT_LIB = -lcrypt + #SSL_LIBS = -L${SSL_TREE}/lib -lssl -lcrypto + + +-BINDIR = /usr/local/sbin +-MANDIR = /usr/local/man ++BINDIR = /usr/sbin ++MANDIR = /usr/share/man + CC = gcc + CDEFS = ${SSL_DEFS} ${SSL_INC} + CFLAGS = -O ${CDEFS} + diff --git a/packages/mini-httpd/files/remove-CC.patch b/packages/mini-httpd/files/remove-CC.patch new file mode 100644 index 0000000000..0fddcd7cb6 --- /dev/null +++ b/packages/mini-httpd/files/remove-CC.patch @@ -0,0 +1,13 @@ +diff -NurpP --minimal mini_httpd-1.19/Makefile mini_httpd-1.19-new/Makefile +--- mini_httpd-1.19/Makefile 2008-10-06 15:45:44.000000000 +0800 ++++ mini_httpd-1.19-new/Makefile 2008-10-06 15:46:11.000000000 +0800 +@@ -22,7 +22,7 @@ CRYPT_LIB = -lcrypt + + BINDIR = /usr/sbin + MANDIR = /usr/share/man +-CC = gcc ++#CC = gcc + CDEFS = ${SSL_DEFS} ${SSL_INC} + CFLAGS = -O ${CDEFS} + #CFLAGS = -g ${CDEFS} + diff --git a/packages/mini-httpd/mini-httpd_1.19.bb b/packages/mini-httpd/mini-httpd_1.19.bb new file mode 100644 index 0000000000..6ca44e79ee --- /dev/null +++ b/packages/mini-httpd/mini-httpd_1.19.bb @@ -0,0 +1,36 @@ +# Copyright (C) 2009 Khem Raj +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "mini_httpd is a small HTTP server. \ + It implements all the basic features of an HTTP server \ + It can also be configured to do SSL/HTTPS and IPv6. \ + " +HOMEPAGE = "http://www.acme.com/software/mini_httpd/" +LICENSE = "BSD" +SECTION = "net" +DEPENDS = "openssl" +PR = "r0" + +SRC_URI="http://www.acme.com/software/mini_httpd/mini_httpd-${PV}.tar.gz \ + file://new-bindir-mandir.patch;patch=1 \ + file://remove-CC.patch;patch=1 \ + file://mini-httpd.conf \ + file://init \ + " + +INITSCRIPT_NAME = "mini_httpd" +INITSCRIPT_PARAMS = "defaults" + +S = "${WORKDIR}/mini_httpd-${PV}" + + +inherit autotools update-rc.d + +do_install () { + install -d ${D}${sysconfdir} + install -d ${D}${sysconfdir}/init.d + install -d ${D}${sysconfdir}/mini-httpd + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/mini_httpd + install -m 0755 ${WORKDIR}/mini-httpd.conf ${D}${sysconfdir}/mini-httpd.conf + oe_runmake 'BINDIR=${D}${sbindir}' 'MANDIR=${D}${mandir}' install +} -- cgit v1.2.3