summaryrefslogtreecommitdiff
path: root/recipes-core
diff options
context:
space:
mode:
authorPatrick Murphy <Patrick.Murphy@multitech.com>2020-06-10 16:30:03 -0500
committerJohn Klug <john.klug@multitech.com>2020-06-18 20:22:08 -0500
commit01f73eaf483ea5050a26098c3eb5949275118f3c (patch)
tree1b47e66e6c832ef56bae96d9eb8bcfc960b9981d /recipes-core
parent21ba34aa24d4953e278dc35e010f7d9b9f6842e2 (diff)
downloadmeta-mlinux-01f73eaf483ea5050a26098c3eb5949275118f3c.tar.gz
meta-mlinux-01f73eaf483ea5050a26098c3eb5949275118f3c.tar.bz2
meta-mlinux-01f73eaf483ea5050a26098c3eb5949275118f3c.zip
recovered 1.4.48 default init script
Diffstat (limited to 'recipes-core')
-rw-r--r--recipes-core/file-magic-db-images/file-magic-db-images_0.1.bb27
-rw-r--r--recipes-core/file-magic-db-images/files/COPYING29
-rw-r--r--recipes-core/file-magic-db-images/files/Magdir/images78
-rw-r--r--recipes-core/file-magic-db-images/files/Magdir/jpeg119
-rw-r--r--recipes-core/file-magic-db-images/files/Magdir/msdos29
-rw-r--r--recipes-core/file-magic-db-images/files/Magdir/sgml8
-rw-r--r--recipes-core/lighttpd/lighttpd/0001-lighttpd-pcre-use-pkg-config.patch (renamed from recipes-core/lighttpd/files/0001-lighttpd-pcre-use-pkg-config.patch)0
-rw-r--r--recipes-core/lighttpd/lighttpd/0002_extended_tls_conf.patch (renamed from recipes-core/lighttpd/files/0002_extended_tls_conf.patch)0
-rw-r--r--recipes-core/lighttpd/lighttpd/0004_fastcgi_env_with_unixsocket.patch (renamed from recipes-core/lighttpd/files/0004_fastcgi_env_with_unixsocket.patch)0
-rw-r--r--recipes-core/lighttpd/lighttpd/lighttpd.conf (renamed from recipes-core/lighttpd/files/lighttpd.conf)0
-rw-r--r--recipes-core/lighttpd/lighttpd/lighttpd.init34
-rw-r--r--recipes-core/lighttpd/lighttpd/lighttpd_custom_images_setup (renamed from recipes-core/lighttpd/files/lighttpd_custom_images_setup)0
-rw-r--r--recipes-core/lighttpd/lighttpd/lighttpd_nrs.conf (renamed from recipes-core/lighttpd/files/lighttpd_nrs.conf)0
-rw-r--r--recipes-core/lighttpd/lighttpd_1.4.48.bb13
14 files changed, 37 insertions, 300 deletions
diff --git a/recipes-core/file-magic-db-images/file-magic-db-images_0.1.bb b/recipes-core/file-magic-db-images/file-magic-db-images_0.1.bb
deleted file mode 100644
index 43d3052..0000000
--- a/recipes-core/file-magic-db-images/file-magic-db-images_0.1.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Stripped MIME detection database for file(1) with definition of images"
-HOMEPAGE = "http://www.darwinsys.com/file/"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=6a7382872edb68d33e1a9398b6e03188"
-DEPENDS = "file-native"
-FILES_${PN} = "${datadir}/misc/magic-images.mgc"
-
-PV = "0.1"
-PR = "r5"
-
-SRC_URI = "file://COPYING \
- file://Magdir/images \
- file://Magdir/jpeg \
- file://Magdir/msdos \
- file://Magdir/sgml"
-
-S = "${WORKDIR}"
-
-do_compile() {
- ${STAGING_BINDIR_NATIVE}/file-native/file -v
- ${STAGING_BINDIR_NATIVE}/file-native/file -C -m ${S}/Magdir
-}
-
-do_install() {
- install -d ${D}/${datadir}/misc/
- install -m 0644 ${WORKDIR}/Magdir.mgc ${D}/${datadir}/misc/magic-images.mgc
-}
diff --git a/recipes-core/file-magic-db-images/files/COPYING b/recipes-core/file-magic-db-images/files/COPYING
deleted file mode 100644
index 68148e2..0000000
--- a/recipes-core/file-magic-db-images/files/COPYING
+++ /dev/null
@@ -1,29 +0,0 @@
-$File: LEGAL.NOTICE,v 1.15 2006/05/03 18:48:33 christos Exp $
-Copyright (c) Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992, 1994, 1995.
-Software written by Ian F. Darwin and others;
-maintained 1994- Christos Zoulas.
-
-This software is not subject to any export provision of the United States
-Department of Commerce, and may be exported to any country or planet.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
- notice immediately at the beginning of the file, without modification,
- this list of conditions, and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
diff --git a/recipes-core/file-magic-db-images/files/Magdir/images b/recipes-core/file-magic-db-images/files/Magdir/images
deleted file mode 100644
index 493027f..0000000
--- a/recipes-core/file-magic-db-images/files/Magdir/images
+++ /dev/null
@@ -1,78 +0,0 @@
-# PNG [Portable Network Graphics, or "PNG's Not GIF"] images
-# (Greg Roelofs, newt@uchicago.edu)
-# (Albert Cahalan, acahalan@cs.uml.edu)
-#
-# 137 P N G \r \n ^Z \n [4-byte length] H E A D [HEAD data] [HEAD crc] ...
-#
-0 string \x89PNG\x0d\x0a\x1a\x0a PNG image data
-!:mime image/png
->16 belong x \b, %d x
->20 belong x %d,
->24 byte x %d-bit
->25 byte 0 grayscale,
->25 byte 2 \b/color RGB,
->25 byte 3 colormap,
->25 byte 4 gray+alpha,
->25 byte 6 \b/color RGBA,
-#>26 byte 0 deflate/32K,
->28 byte 0 non-interlaced
->28 byte 1 interlaced
-
-# GIF
-0 string GIF8 GIF image data
-!:mime image/gif
-!:apple 8BIMGIFf
->4 string 7a \b, version 8%s,
->4 string 9a \b, version 8%s,
->6 leshort >0 %d x
->8 leshort >0 %d
-#>10 byte &0x80 color mapped,
-#>10 byte&0x07 =0x00 2 colors
-#>10 byte&0x07 =0x01 4 colors
-#>10 byte&0x07 =0x02 8 colors
-#>10 byte&0x07 =0x03 16 colors
-#>10 byte&0x07 =0x04 32 colors
-#>10 byte&0x07 =0x05 64 colors
-#>10 byte&0x07 =0x06 128 colors
-#>10 byte&0x07 =0x07 256 colors
-
-# PC bitmaps (OS/2, Windows BMP files) (Greg Roelofs, newt@uchicago.edu)
-# http://en.wikipedia.org/wiki/BMP_file_format#DIB_header_.\
-# 28bitmap_information_header.29
-0 string BM
->14 leshort 12 PC bitmap, OS/2 1.x format
-!:mime image/x-ms-bmp
->>18 leshort x \b, %d x
->>20 leshort x %d
->14 leshort 64 PC bitmap, OS/2 2.x format
-!:mime image/x-ms-bmp
->>18 leshort x \b, %d x
->>20 leshort x %d
->14 leshort 40 PC bitmap, Windows 3.x format
-!:mime image/x-ms-bmp
->>18 lelong x \b, %d x
->>22 lelong x %d x
->>28 leshort x %d
->14 leshort 124 PC bitmap, Windows 98/2000 and newer format
-!:mime image/x-ms-bmp
->>18 lelong x \b, %d x
->>22 lelong x %d x
->>28 leshort x %d
->14 leshort 108 PC bitmap, Windows 95/NT4 and newer format
-!:mime image/x-ms-bmp
->>18 lelong x \b, %d x
->>22 lelong x %d x
->>28 leshort x %d
->14 leshort 128 PC bitmap, Windows NT/2000 format
-!:mime image/x-ms-bmp
->>18 lelong x \b, %d x
->>22 lelong x %d x
->>28 leshort x %d
-# Too simple - MPi
-#0 string IC PC icon data
-#0 string PI PC pointer image data
-#0 string CI PC color icon data
-#0 string CP PC color pointer image data
-# Conflicts with other entries [BABYL]
-#0 string BA PC bitmap array data
-
diff --git a/recipes-core/file-magic-db-images/files/Magdir/jpeg b/recipes-core/file-magic-db-images/files/Magdir/jpeg
deleted file mode 100644
index e6a4ffa..0000000
--- a/recipes-core/file-magic-db-images/files/Magdir/jpeg
+++ /dev/null
@@ -1,119 +0,0 @@
-
-#------------------------------------------------------------------------------
-# $File: jpeg,v 1.28 2015/04/09 20:01:40 christos Exp $
-# JPEG images
-# SunOS 5.5.1 had
-#
-# 0 string \377\330\377\340 JPEG file
-# 0 string \377\330\377\356 JPG file
-#
-# both of which turn into "JPEG image data" here.
-#
-0 beshort 0xffd8 JPEG image data
-!:mime image/jpeg
-!:apple 8BIMJPEG
-!:strength *3
-!:ext jpeg/jpg/jpe/jfif
->6 string JFIF \b, JFIF standard
-# The following added by Erik Rossen <rossen@freesurf.ch> 1999-09-06
-# in a vain attempt to add image size reporting for JFIF. Note that these
-# tests are not fool-proof since some perfectly valid JPEGs are currently
-# impossible to specify in magic(4) format.
-# First, a little JFIF version info:
->>11 byte x \b %d.
->>12 byte x \b%02d
-# Next, the resolution or aspect ratio of the image:
->>13 byte 0 \b, aspect ratio
->>13 byte 1 \b, resolution (DPI)
->>13 byte 2 \b, resolution (DPCM)
->>14 beshort x \b, density %dx
->>16 beshort x \b%d
->>4 beshort x \b, segment length %d
-# Next, show thumbnail info, if it exists:
->>18 byte !0 \b, thumbnail %dx
->>>19 byte x \b%d
->6 string Exif \b, Exif standard: [
->>12 indirect/r x
->>12 string x \b]
-
-# Jump to the first segment
->(4.S+4) use jpeg_segment
-
-# This uses recursion...
-0 name jpeg_segment
->0 beshort 0xFFFE
-# Recursion handled by FFE0
-#>>(2.S+2) use jpeg_segment
->>2 pstring/HJ x \b, comment: "%s"
-
->0 beshort 0xFFC0
->>(2.S+2) use jpeg_segment
->>4 byte x \b, baseline, precision %d
->>7 beshort x \b, %dx
->>5 beshort x \b%d
->>9 byte x \b, frames %d
-
->0 beshort 0xFFC1
->>(2.S+2) use jpeg_segment
->>4 byte x \b, extended sequential, precision %d
->>7 beshort x \b, %dx
->>5 beshort x \b%d
->>9 byte x \b, frames %d
-
->0 beshort 0xFFC2
->>(2.S+2) use jpeg_segment
->>4 byte x \b, progressive, precision %d
->>7 beshort x \b, %dx
->>5 beshort x \b%d
->>9 byte x \b, frames %d
-
-# Define Huffman Tables
->0 beshort 0xFFC4
->>(2.S+2) use jpeg_segment
-
->0 beshort 0xFFE1
-# Recursion handled by FFE0
-#>>(2.S+2) use jpeg_segment
->>4 string Exif \b, Exif Standard: [
->>>10 indirect/r x
->>>10 string x \b]
-
-# Application specific markers
->0 beshort&0xFFE0 =0xFFE0
->>(2.S+2) use jpeg_segment
-
-# DB: Define Quantization tables
-# DD: Define Restart interval [XXX: wrong here, it is 4 bytes]
-# D8: Start of image
-# D9: End of image
-# Dn: Restart
->0 beshort&0xFFD0 =0xFFD0
->>0 beshort&0xFFE0 !0xFFE0
->>>(2.S+2) use jpeg_segment
-
-#>0 beshort x unknown 0x%x
-#>>(2.S+2) use jpeg_segment
-
-# HSI is Handmade Software's proprietary JPEG encoding scheme
-0 string hsi1 JPEG image data, HSI proprietary
-
-# From: David Santinoli <david@santinoli.com>
-0 string \x00\x00\x00\x0C\x6A\x50\x20\x20\x0D\x0A\x87\x0A JPEG 2000
-# From: Johan van der Knijff <johan.vanderknijff@kb.nl>
-# Added sub-entries for JP2, JPX, JPM and MJ2 formats; added mimetypes
-# https://github.com/bitsgalore/jp2kMagic
-#
-# Now read value of 'Brand' field, which yields a few possibilities:
->20 string \x6a\x70\x32\x20 Part 1 (JP2)
-!:mime image/jp2
->20 string \x6a\x70\x78\x20 Part 2 (JPX)
-!:mime image/jpx
->20 string \x6a\x70\x6d\x20 Part 6 (JPM)
-!:mime image/jpm
->20 string \x6d\x6a\x70\x32 Part 3 (MJ2)
-!:mime video/mj2
-
-# Type: JPEG 2000 codesream
-# From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
-0 belong 0xff4fff51 JPEG 2000 codestream
-45 beshort 0xff52
diff --git a/recipes-core/file-magic-db-images/files/Magdir/msdos b/recipes-core/file-magic-db-images/files/Magdir/msdos
deleted file mode 100644
index 7b1330e..0000000
--- a/recipes-core/file-magic-db-images/files/Magdir/msdos
+++ /dev/null
@@ -1,29 +0,0 @@
-
-#------------------------------------------------------------------------------
-# $File: msdos,v 1.105 2016/03/03 18:58:14 christos Exp $
-# msdos: file(1) magic for MS-DOS files
-#
-
-# Windows icons
-# Update: Joerg Jenderek
-# URL: https://en.wikipedia.org/wiki/CUR_(file_format)
-# Note: similiar to Windows CURsor. container for BMP (only DIB part) or PNG
-0 belong 0x00000100
->9 byte 0
->>0 byte x
->>0 use cur-ico-dir
->9 ubyte 0xff
->>0 byte x
->>0 use cur-ico-dir
-# displays number of icons and information for icon or cursor
-0 name cur-ico-dir
-# skip some Lotus 1-2-3 worksheets, CYCLE.PIC and keep Windows cursors with
-# 1st data offset = dir header size + n * dir entry size = 6 + n * 10h = ?6h
->18 ulelong &0x00000006
-# skip remaining worksheets, because valid only for DIB image (40) or PNG image (\x89PNG)
->>(18.l) ulelong x MS Windows
->>>0 ubelong 0x00000100 icon resource
-#!:mime image/vnd.microsoft.icon
-!:mime image/x-icon
-!:ext ico
-
diff --git a/recipes-core/file-magic-db-images/files/Magdir/sgml b/recipes-core/file-magic-db-images/files/Magdir/sgml
deleted file mode 100644
index 79abe8c..0000000
--- a/recipes-core/file-magic-db-images/files/Magdir/sgml
+++ /dev/null
@@ -1,8 +0,0 @@
-#------------------------------------------------------------------------------ # $File: sgml,v 1.32 2015/07/11 15:08:53 christos Exp $
-# Type: SVG Vectorial Graphics
-# From: Noel Torres <tecnico@ejerciciosresueltos.com>
-0 string \<?xml\ version="
->15 string >\0
->>19 search/4096 \<svg SVG Scalable Vector Graphics image
-!:mime image/svg+xml
-
diff --git a/recipes-core/lighttpd/files/0001-lighttpd-pcre-use-pkg-config.patch b/recipes-core/lighttpd/lighttpd/0001-lighttpd-pcre-use-pkg-config.patch
index 48be920..48be920 100644
--- a/recipes-core/lighttpd/files/0001-lighttpd-pcre-use-pkg-config.patch
+++ b/recipes-core/lighttpd/lighttpd/0001-lighttpd-pcre-use-pkg-config.patch
diff --git a/recipes-core/lighttpd/files/0002_extended_tls_conf.patch b/recipes-core/lighttpd/lighttpd/0002_extended_tls_conf.patch
index 1a216dd..1a216dd 100644
--- a/recipes-core/lighttpd/files/0002_extended_tls_conf.patch
+++ b/recipes-core/lighttpd/lighttpd/0002_extended_tls_conf.patch
diff --git a/recipes-core/lighttpd/files/0004_fastcgi_env_with_unixsocket.patch b/recipes-core/lighttpd/lighttpd/0004_fastcgi_env_with_unixsocket.patch
index c265066..c265066 100644
--- a/recipes-core/lighttpd/files/0004_fastcgi_env_with_unixsocket.patch
+++ b/recipes-core/lighttpd/lighttpd/0004_fastcgi_env_with_unixsocket.patch
diff --git a/recipes-core/lighttpd/files/lighttpd.conf b/recipes-core/lighttpd/lighttpd/lighttpd.conf
index a3e02da..a3e02da 100644
--- a/recipes-core/lighttpd/files/lighttpd.conf
+++ b/recipes-core/lighttpd/lighttpd/lighttpd.conf
diff --git a/recipes-core/lighttpd/lighttpd/lighttpd.init b/recipes-core/lighttpd/lighttpd/lighttpd.init
new file mode 100644
index 0000000..bf89a60
--- /dev/null
+++ b/recipes-core/lighttpd/lighttpd/lighttpd.init
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/lighttpd
+NAME=lighttpd
+DESC="Lighttpd Web Server"
+OPTS="-f /etc/lighttpd.conf"
+
+case "$1" in
+ start)
+ echo -n "Starting $DESC: "
+ start-stop-daemon --start -x "$DAEMON" -- $OPTS
+ echo "$NAME."
+ ;;
+ stop)
+ echo -n "Stopping $DESC: "
+ start-stop-daemon --stop -x "$DAEMON"
+ echo "$NAME."
+ ;;
+ restart|force-reload)
+ echo -n "Restarting $DESC: "
+ start-stop-daemon --stop -x "$DAEMON"
+ sleep 1
+ start-stop-daemon --start -x "$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/recipes-core/lighttpd/files/lighttpd_custom_images_setup b/recipes-core/lighttpd/lighttpd/lighttpd_custom_images_setup
index ecd5f46..ecd5f46 100644
--- a/recipes-core/lighttpd/files/lighttpd_custom_images_setup
+++ b/recipes-core/lighttpd/lighttpd/lighttpd_custom_images_setup
diff --git a/recipes-core/lighttpd/files/lighttpd_nrs.conf b/recipes-core/lighttpd/lighttpd/lighttpd_nrs.conf
index 8c23747..8c23747 100644
--- a/recipes-core/lighttpd/files/lighttpd_nrs.conf
+++ b/recipes-core/lighttpd/lighttpd/lighttpd_nrs.conf
diff --git a/recipes-core/lighttpd/lighttpd_1.4.48.bb b/recipes-core/lighttpd/lighttpd_1.4.48.bb
index 776acc9..19e6cf2 100644
--- a/recipes-core/lighttpd/lighttpd_1.4.48.bb
+++ b/recipes-core/lighttpd/lighttpd_1.4.48.bb
@@ -5,7 +5,6 @@ BUGTRACKER = "http://redmine.lighttpd.net/projects/lighttpd/issues"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579"
-PR .= ".mts21"
SECTION = "net"
DEPENDS = "zlib libpcre openssl"
@@ -22,13 +21,11 @@ RDEPENDS_${PN} += " \
"
RDEPENDS_${PN} += " openssl"
# for lighttpd_custom_images_setup script
-RDEPENDS_${PN} += "bash file file-magic-db-images"
SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.gz \
file://lighttpd.conf \
- file://lighttpd_nrs.conf \
- file://lighttpd_custom_images_setup \
+ file://lighttpd.init \
file://0001-lighttpd-pcre-use-pkg-config.patch;apply=true \
file://0004_fastcgi_env_with_unixsocket.patch;apply=true \
"
@@ -64,16 +61,13 @@ do_install_append() {
install -d ${D}${sysconfdir}/init.d ${D}${sysconfdir}/lighttpd.d ${D}/www/pages/dav
install -d 0644 ${D}${sysconfdir}/ssl
install -m 0755 --group www -d ${D}${localstatedir}/www
+# install -m 0755 ${WORKDIR}/lighttpd.init ${D}${sysconfdir}/init.d/lighttpd
install -m 0644 --group www ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}
- install -m 0644 --group www ${WORKDIR}/lighttpd_nrs.conf ${D}${sysconfdir}
#For FHS compliance, create symbolic links to /var/log and /var/tmp for logs and temporary data
ln -sf ${localstatedir}/log ${D}/www/logs
ln -sf ${localstatedir}/tmp ${D}/www/var
- ln -snf ../volatile/www/tmp ${D}${localstatedir}/www/tmp
-
- install -d ${D}/${base_sbindir}
- install -m 755 ${WORKDIR}/lighttpd_custom_images_setup ${D}/${base_sbindir}/lighttpd_custom_images_setup
+ ln -snf ../volatile/www/tmp ${D}${localstatedir}/www/tmp}
}
do_install_append_mtr() {
@@ -87,7 +81,6 @@ do_install_append_mtrv1() {
FILES_${PN} += "${sysconfdir} /www"
CONFFILES_${PN} = "${sysconfdir}/lighttpd.conf \
- ${sysconfdir}/lighttpd_nrs.conf \
"
PACKAGES_DYNAMIC += "^lighttpd-module-.*"