From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3a7dd58834aa9d6d466e5785e208bbe3e60747d4
Date: Mon, 12 Nov 2018 00:17:44 +0000 [thread overview]
Message-ID: <20181112001745.E584D1081BB0@git01.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 43358 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 3a7dd58834aa9d6d466e5785e208bbe3e60747d4 (commit)
via 93aa56a6986ca6be92c5aaac6dc78c6a7b2bcff4 (commit)
via 9fbbf3fda2e4353a76e369b6a863027722b164c9 (commit)
via 6dc7b04bead7bdeba8607377fff453c2f2cb94f2 (commit)
via b7dbcd158d79fdd161818d0bafa29b92008fd5d4 (commit)
via 63dc6532d12029bb7eaa766c346243f4d7ad5ea9 (commit)
via c708fa157f3c09ebc0d2b8b5fabbcbf6eef1a7f7 (commit)
via f3e62301253f99e6ff65539db8294aec7c5bd05b (commit)
via 41f8d64284813e8f7144ac34a28e430a4f3d42f6 (commit)
from 5187740ed2be9227fe3476aeb69722b84b5f5eaa (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3a7dd58834aa9d6d466e5785e208bbe3e60747d4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Nov 12 00:16:23 2018 +0000
core126: Ship libconfig
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 93aa56a6986ca6be92c5aaac6dc78c6a7b2bcff4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Nov 12 00:15:28 2018 +0000
Start Core Update 126
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 9fbbf3fda2e4353a76e369b6a863027722b164c9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Nov 11 18:57:55 2018 +0000
shairport-sync: Add install/uninstall scripts
These scripts will install symlinks to start the service
at boot time.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 6dc7b04bead7bdeba8607377fff453c2f2cb94f2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Nov 11 18:55:35 2018 +0000
shairport-sync: Add initscript
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b7dbcd158d79fdd161818d0bafa29b92008fd5d4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Nov 11 18:52:10 2018 +0000
shairport-sync: Explicitely link against soxr
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 63dc6532d12029bb7eaa766c346243f4d7ad5ea9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Nov 11 17:34:11 2018 +0000
shairport-sync: Add backup include file
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c708fa157f3c09ebc0d2b8b5fabbcbf6eef1a7f7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Nov 11 17:26:35 2018 +0000
shairport-sync: New package
Shairport Sync is an AirPlay audio player - it plays audio streamed
from iTunes, iOS, Apple TV and macOS devices and AirPlay sources
such as Quicktime Player and ForkedDaapd, among others.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f3e62301253f99e6ff65539db8294aec7c5bd05b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Nov 11 17:23:20 2018 +0000
libconfig: New package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 41f8d64284813e8f7144ac34a28e430a4f3d42f6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Nov 11 16:21:01 2018 +0000
soxr: New package (0.1.3)
The SoX Resampler library `libsoxr' performs one-dimensional sample-rate
conversion -- it may be used, for example, to resample PCM-encoded audio.
For higher-dimensional resampling, such as for visual-image processing, you
should look elsewhere.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/backup/includes/shairport-sync | 1 +
config/rootfiles/common/libconfig | 19 +++++++++++++++
config/rootfiles/core/{125 => 126}/exclude | 0
.../{oldcore/113 => core/126}/filelists/files | 3 +--
config/rootfiles/core/126/filelists/libconfig | 1 +
.../rootfiles/{oldcore/112 => core/126}/update.sh | 11 +++------
config/rootfiles/{core => oldcore}/125/exclude | 0
.../{core => oldcore}/125/filelists/aarch64/glibc | 0
.../{core => oldcore}/125/filelists/apache2 | 0
.../rootfiles/{core => oldcore}/125/filelists/bind | 0
.../125/filelists/ca-certificates | 0
.../{core => oldcore}/125/filelists/collectd | 0
.../{core => oldcore}/125/filelists/coreutils | 0
.../{core => oldcore}/125/filelists/dhcpcd | 0
.../{core => oldcore}/125/filelists/e2fsprogs | 0
.../{core => oldcore}/125/filelists/files | 0
.../{core => oldcore}/125/filelists/gnutls | 0
.../{core => oldcore}/125/filelists/i586/glibc | 0
.../{core => oldcore}/125/filelists/json-c | 0
.../{core => oldcore}/125/filelists/keyutils | 0
.../rootfiles/{core => oldcore}/125/filelists/kmod | 0
.../{core => oldcore}/125/filelists/libaio | 0
.../rootfiles/{core => oldcore}/125/filelists/lvm2 | 0
.../{core => oldcore}/125/filelists/ntfs-3g | 0
.../{core => oldcore}/125/filelists/parted | 0
.../rootfiles/{core => oldcore}/125/filelists/ppp | 0
.../{core => oldcore}/125/filelists/reiserfsprogs | 0
.../{core => oldcore}/125/filelists/sqlite | 0
.../{core => oldcore}/125/filelists/squid | 0
.../{core => oldcore}/125/filelists/strongswan | 0
.../{core => oldcore}/125/filelists/tzdata | 0
.../rootfiles/{core => oldcore}/125/filelists/udev | 0
.../{core => oldcore}/125/filelists/unbound | 0
.../{core => oldcore}/125/filelists/x86_64/glibc | 0
.../{core => oldcore}/125/filelists/xfsprogs | 0
config/rootfiles/{core => oldcore}/125/update.sh | 0
config/rootfiles/packages/shairport-sync | 6 +++++
config/rootfiles/packages/soxr | 23 ++++++++++++++++++
lfs/{lcms2 => libconfig} | 7 +++---
lfs/{wget => shairport-sync} | 28 ++++++++++++++++------
lfs/{jansson => soxr} | 20 +++++++++-------
make.sh | 5 +++-
.../{system/template => packages/shairport-sync} | 27 +++++++--------------
.../{mdns-repeater => shairport-sync}/install.sh | 6 ++---
.../{mdns-repeater => shairport-sync}/uninstall.sh | 2 +-
.../{mdns-repeater => shairport-sync}/update.sh | 0
46 files changed, 107 insertions(+), 52 deletions(-)
create mode 100644 config/backup/includes/shairport-sync
create mode 100644 config/rootfiles/common/libconfig
copy config/rootfiles/core/{125 => 126}/exclude (100%)
copy config/rootfiles/{oldcore/113 => core/126}/filelists/files (51%)
create mode 120000 config/rootfiles/core/126/filelists/libconfig
copy config/rootfiles/{oldcore/112 => core/126}/update.sh (94%)
rename config/rootfiles/{core => oldcore}/125/exclude (100%)
rename config/rootfiles/{core => oldcore}/125/filelists/aarch64/glibc (100%)
rename config/rootfiles/{core => oldcore}/125/filelists/apache2 (100%)
rename config/rootfiles/{core => oldcore}/125/filelists/bind (100%)
rename config/rootfiles/{core => oldcore}/125/filelists/ca-certificates (100%)
rename config/rootfiles/{core => oldcore}/125/filelists/collectd (100%)
rename config/rootfiles/{core => oldcore}/125/filelists/coreutils (100%)
rename config/rootfiles/{core => oldcore}/125/filelists/dhcpcd (100%)
rename config/rootfiles/{core => oldcore}/125/filelists/e2fsprogs (100%)
rename config/rootfiles/{core => oldcore}/125/filelists/files (100%)
rename config/rootfiles/{core => oldcore}/125/filelists/gnutls (100%)
rename config/rootfiles/{core => oldcore}/125/filelists/i586/glibc (100%)
rename config/rootfiles/{core => oldcore}/125/filelists/json-c (100%)
rename config/rootfiles/{core => oldcore}/125/filelists/keyutils (100%)
rename config/rootfiles/{core => oldcore}/125/filelists/kmod (100%)
rename config/rootfiles/{core => oldcore}/125/filelists/libaio (100%)
rename config/rootfiles/{core => oldcore}/125/filelists/lvm2 (100%)
rename config/rootfiles/{core => oldcore}/125/filelists/ntfs-3g (100%)
rename config/rootfiles/{core => oldcore}/125/filelists/parted (100%)
rename config/rootfiles/{core => oldcore}/125/filelists/ppp (100%)
rename config/rootfiles/{core => oldcore}/125/filelists/reiserfsprogs (100%)
rename config/rootfiles/{core => oldcore}/125/filelists/sqlite (100%)
rename config/rootfiles/{core => oldcore}/125/filelists/squid (100%)
rename config/rootfiles/{core => oldcore}/125/filelists/strongswan (100%)
rename config/rootfiles/{core => oldcore}/125/filelists/tzdata (100%)
rename config/rootfiles/{core => oldcore}/125/filelists/udev (100%)
rename config/rootfiles/{core => oldcore}/125/filelists/unbound (100%)
rename config/rootfiles/{core => oldcore}/125/filelists/x86_64/glibc (100%)
rename config/rootfiles/{core => oldcore}/125/filelists/xfsprogs (100%)
rename config/rootfiles/{core => oldcore}/125/update.sh (100%)
create mode 100644 config/rootfiles/packages/shairport-sync
create mode 100644 config/rootfiles/packages/soxr
copy lfs/{lcms2 => libconfig} (95%)
copy lfs/{wget => shairport-sync} (86%)
copy lfs/{jansson => soxr} (87%)
copy src/initscripts/{system/template => packages/shairport-sync} (53%)
mode change 100644 => 100755
copy src/paks/{mdns-repeater => shairport-sync}/install.sh (90%)
copy src/paks/{mdns-repeater => shairport-sync}/uninstall.sh (97%)
copy src/paks/{mdns-repeater => shairport-sync}/update.sh (100%)
Difference in files:
diff --git a/config/backup/includes/shairport-sync b/config/backup/includes/shairport-sync
new file mode 100644
index 000000000..dc92185f9
--- /dev/null
+++ b/config/backup/includes/shairport-sync
@@ -0,0 +1 @@
+etc/shairport-sync.conf
diff --git a/config/rootfiles/common/libconfig b/config/rootfiles/common/libconfig
new file mode 100644
index 000000000..de1bcef0a
--- /dev/null
+++ b/config/rootfiles/common/libconfig
@@ -0,0 +1,19 @@
+#usr/include/libconfig.h
+#usr/include/libconfig.h++
+#usr/lib/cmake/libconfig
+#usr/lib/cmake/libconfig++
+#usr/lib/cmake/libconfig++/libconfig++Config.cmake
+#usr/lib/cmake/libconfig/libconfigConfig.cmake
+#usr/lib/libconfig++.a
+#usr/lib/libconfig++.la
+#usr/lib/libconfig++.so
+usr/lib/libconfig++.so.11
+usr/lib/libconfig++.so.11.0.2
+#usr/lib/libconfig.a
+#usr/lib/libconfig.la
+#usr/lib/libconfig.so
+usr/lib/libconfig.so.11
+usr/lib/libconfig.so.11.0.2
+#usr/lib/pkgconfig/libconfig++.pc
+#usr/lib/pkgconfig/libconfig.pc
+#usr/share/info/libconfig.info
diff --git a/config/rootfiles/core/125/exclude b/config/rootfiles/core/126/exclude
similarity index 100%
rename from config/rootfiles/core/125/exclude
rename to config/rootfiles/core/126/exclude
diff --git a/config/rootfiles/core/126/filelists/files b/config/rootfiles/core/126/filelists/files
new file mode 100644
index 000000000..ce4e51768
--- /dev/null
+++ b/config/rootfiles/core/126/filelists/files
@@ -0,0 +1,4 @@
+etc/system-release
+etc/issue
+srv/web/ipfire/cgi-bin/credits.cgi
+var/ipfire/langs
diff --git a/config/rootfiles/core/126/filelists/libconfig b/config/rootfiles/core/126/filelists/libconfig
new file mode 120000
index 000000000..6e4e0678f
--- /dev/null
+++ b/config/rootfiles/core/126/filelists/libconfig
@@ -0,0 +1 @@
+../../../common/libconfig
\ No newline at end of file
diff --git a/config/rootfiles/core/126/update.sh b/config/rootfiles/core/126/update.sh
new file mode 100644
index 000000000..7c81f4f24
--- /dev/null
+++ b/config/rootfiles/core/126/update.sh
@@ -0,0 +1,62 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2017 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=126
+
+# Remove old core updates from pakfire cache to save space...
+for (( i=1; i<=$core; i++ )); do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Stop services
+
+# Extract files
+extract_files
+
+# update linker config
+ldconfig
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Start services
+
+# This update needs a reboot...
+#touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+
+# Update grub config to display new core version
+if [ -e /boot/grub/grub.cfg ]; then
+ grub-mkconfig -o /boot/grub/grub.cfg
+fi
+
+sync
+
+# Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/oldcore/125/exclude b/config/rootfiles/oldcore/125/exclude
new file mode 100644
index 000000000..b22159878
--- /dev/null
+++ b/config/rootfiles/oldcore/125/exclude
@@ -0,0 +1,28 @@
+boot/config.txt
+boot/grub/grub.cfg
+boot/grub/grubenv
+etc/alternatives
+etc/collectd.custom
+etc/default/grub
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/snort/snort.conf
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/dma
+var/ipfire/time
+var/ipfire/ovpn
+var/lib/alternatives
+var/log/cache
+var/log/dhcpcd.log
+var/log/messages
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/core/125/filelists/aarch64/glibc b/config/rootfiles/oldcore/125/filelists/aarch64/glibc
similarity index 100%
rename from config/rootfiles/core/125/filelists/aarch64/glibc
rename to config/rootfiles/oldcore/125/filelists/aarch64/glibc
diff --git a/config/rootfiles/core/125/filelists/apache2 b/config/rootfiles/oldcore/125/filelists/apache2
similarity index 100%
rename from config/rootfiles/core/125/filelists/apache2
rename to config/rootfiles/oldcore/125/filelists/apache2
diff --git a/config/rootfiles/core/125/filelists/bind b/config/rootfiles/oldcore/125/filelists/bind
similarity index 100%
rename from config/rootfiles/core/125/filelists/bind
rename to config/rootfiles/oldcore/125/filelists/bind
diff --git a/config/rootfiles/core/125/filelists/ca-certificates b/config/rootfiles/oldcore/125/filelists/ca-certificates
similarity index 100%
rename from config/rootfiles/core/125/filelists/ca-certificates
rename to config/rootfiles/oldcore/125/filelists/ca-certificates
diff --git a/config/rootfiles/core/125/filelists/collectd b/config/rootfiles/oldcore/125/filelists/collectd
similarity index 100%
rename from config/rootfiles/core/125/filelists/collectd
rename to config/rootfiles/oldcore/125/filelists/collectd
diff --git a/config/rootfiles/core/125/filelists/coreutils b/config/rootfiles/oldcore/125/filelists/coreutils
similarity index 100%
rename from config/rootfiles/core/125/filelists/coreutils
rename to config/rootfiles/oldcore/125/filelists/coreutils
diff --git a/config/rootfiles/core/125/filelists/dhcpcd b/config/rootfiles/oldcore/125/filelists/dhcpcd
similarity index 100%
rename from config/rootfiles/core/125/filelists/dhcpcd
rename to config/rootfiles/oldcore/125/filelists/dhcpcd
diff --git a/config/rootfiles/core/125/filelists/e2fsprogs b/config/rootfiles/oldcore/125/filelists/e2fsprogs
similarity index 100%
rename from config/rootfiles/core/125/filelists/e2fsprogs
rename to config/rootfiles/oldcore/125/filelists/e2fsprogs
diff --git a/config/rootfiles/core/125/filelists/files b/config/rootfiles/oldcore/125/filelists/files
similarity index 100%
rename from config/rootfiles/core/125/filelists/files
rename to config/rootfiles/oldcore/125/filelists/files
diff --git a/config/rootfiles/core/125/filelists/gnutls b/config/rootfiles/oldcore/125/filelists/gnutls
similarity index 100%
rename from config/rootfiles/core/125/filelists/gnutls
rename to config/rootfiles/oldcore/125/filelists/gnutls
diff --git a/config/rootfiles/core/125/filelists/i586/glibc b/config/rootfiles/oldcore/125/filelists/i586/glibc
similarity index 100%
rename from config/rootfiles/core/125/filelists/i586/glibc
rename to config/rootfiles/oldcore/125/filelists/i586/glibc
diff --git a/config/rootfiles/core/125/filelists/json-c b/config/rootfiles/oldcore/125/filelists/json-c
similarity index 100%
rename from config/rootfiles/core/125/filelists/json-c
rename to config/rootfiles/oldcore/125/filelists/json-c
diff --git a/config/rootfiles/core/125/filelists/keyutils b/config/rootfiles/oldcore/125/filelists/keyutils
similarity index 100%
rename from config/rootfiles/core/125/filelists/keyutils
rename to config/rootfiles/oldcore/125/filelists/keyutils
diff --git a/config/rootfiles/core/125/filelists/kmod b/config/rootfiles/oldcore/125/filelists/kmod
similarity index 100%
rename from config/rootfiles/core/125/filelists/kmod
rename to config/rootfiles/oldcore/125/filelists/kmod
diff --git a/config/rootfiles/core/125/filelists/libaio b/config/rootfiles/oldcore/125/filelists/libaio
similarity index 100%
rename from config/rootfiles/core/125/filelists/libaio
rename to config/rootfiles/oldcore/125/filelists/libaio
diff --git a/config/rootfiles/core/125/filelists/lvm2 b/config/rootfiles/oldcore/125/filelists/lvm2
similarity index 100%
rename from config/rootfiles/core/125/filelists/lvm2
rename to config/rootfiles/oldcore/125/filelists/lvm2
diff --git a/config/rootfiles/core/125/filelists/ntfs-3g b/config/rootfiles/oldcore/125/filelists/ntfs-3g
similarity index 100%
rename from config/rootfiles/core/125/filelists/ntfs-3g
rename to config/rootfiles/oldcore/125/filelists/ntfs-3g
diff --git a/config/rootfiles/core/125/filelists/parted b/config/rootfiles/oldcore/125/filelists/parted
similarity index 100%
rename from config/rootfiles/core/125/filelists/parted
rename to config/rootfiles/oldcore/125/filelists/parted
diff --git a/config/rootfiles/core/125/filelists/ppp b/config/rootfiles/oldcore/125/filelists/ppp
similarity index 100%
rename from config/rootfiles/core/125/filelists/ppp
rename to config/rootfiles/oldcore/125/filelists/ppp
diff --git a/config/rootfiles/core/125/filelists/reiserfsprogs b/config/rootfiles/oldcore/125/filelists/reiserfsprogs
similarity index 100%
rename from config/rootfiles/core/125/filelists/reiserfsprogs
rename to config/rootfiles/oldcore/125/filelists/reiserfsprogs
diff --git a/config/rootfiles/core/125/filelists/sqlite b/config/rootfiles/oldcore/125/filelists/sqlite
similarity index 100%
rename from config/rootfiles/core/125/filelists/sqlite
rename to config/rootfiles/oldcore/125/filelists/sqlite
diff --git a/config/rootfiles/core/125/filelists/squid b/config/rootfiles/oldcore/125/filelists/squid
similarity index 100%
rename from config/rootfiles/core/125/filelists/squid
rename to config/rootfiles/oldcore/125/filelists/squid
diff --git a/config/rootfiles/core/125/filelists/strongswan b/config/rootfiles/oldcore/125/filelists/strongswan
similarity index 100%
rename from config/rootfiles/core/125/filelists/strongswan
rename to config/rootfiles/oldcore/125/filelists/strongswan
diff --git a/config/rootfiles/core/125/filelists/tzdata b/config/rootfiles/oldcore/125/filelists/tzdata
similarity index 100%
rename from config/rootfiles/core/125/filelists/tzdata
rename to config/rootfiles/oldcore/125/filelists/tzdata
diff --git a/config/rootfiles/core/125/filelists/udev b/config/rootfiles/oldcore/125/filelists/udev
similarity index 100%
rename from config/rootfiles/core/125/filelists/udev
rename to config/rootfiles/oldcore/125/filelists/udev
diff --git a/config/rootfiles/core/125/filelists/unbound b/config/rootfiles/oldcore/125/filelists/unbound
similarity index 100%
rename from config/rootfiles/core/125/filelists/unbound
rename to config/rootfiles/oldcore/125/filelists/unbound
diff --git a/config/rootfiles/core/125/filelists/x86_64/glibc b/config/rootfiles/oldcore/125/filelists/x86_64/glibc
similarity index 100%
rename from config/rootfiles/core/125/filelists/x86_64/glibc
rename to config/rootfiles/oldcore/125/filelists/x86_64/glibc
diff --git a/config/rootfiles/core/125/filelists/xfsprogs b/config/rootfiles/oldcore/125/filelists/xfsprogs
similarity index 100%
rename from config/rootfiles/core/125/filelists/xfsprogs
rename to config/rootfiles/oldcore/125/filelists/xfsprogs
diff --git a/config/rootfiles/core/125/update.sh b/config/rootfiles/oldcore/125/update.sh
similarity index 100%
rename from config/rootfiles/core/125/update.sh
rename to config/rootfiles/oldcore/125/update.sh
diff --git a/config/rootfiles/packages/shairport-sync b/config/rootfiles/packages/shairport-sync
new file mode 100644
index 000000000..a0cd5c859
--- /dev/null
+++ b/config/rootfiles/packages/shairport-sync
@@ -0,0 +1,6 @@
+etc/rc.d/init.d/shairport-sync
+etc/shairport-sync.conf
+#etc/shairport-sync.conf.sample
+usr/bin/shairport-sync
+#usr/share/man/man7/shairport-sync.7
+var/ipfire/backup/addons/includes/shairport-sync
diff --git a/config/rootfiles/packages/soxr b/config/rootfiles/packages/soxr
new file mode 100644
index 000000000..2329a7c12
--- /dev/null
+++ b/config/rootfiles/packages/soxr
@@ -0,0 +1,23 @@
+#usr/include/soxr-lsr.h
+#usr/include/soxr.h
+#usr/lib/libsoxr-lsr.so
+usr/lib/libsoxr-lsr.so.0
+usr/lib/libsoxr-lsr.so.0.1.9
+#usr/lib/libsoxr.so
+usr/lib/libsoxr.so.0
+usr/lib/libsoxr.so.0.1.2
+#usr/lib/pkgconfig/soxr-lsr.pc
+#usr/lib/pkgconfig/soxr.pc
+#usr/share/doc/libsoxr
+#usr/share/doc/libsoxr/LICENCE
+#usr/share/doc/libsoxr/NEWS
+#usr/share/doc/libsoxr/README
+#usr/share/doc/libsoxr/examples
+#usr/share/doc/libsoxr/examples/1-single-block.c
+#usr/share/doc/libsoxr/examples/1a-lsr.c
+#usr/share/doc/libsoxr/examples/2-stream.C
+#usr/share/doc/libsoxr/examples/3-options-input-fn.c
+#usr/share/doc/libsoxr/examples/4-split-channels.c
+#usr/share/doc/libsoxr/examples/5-variable-rate.c
+#usr/share/doc/libsoxr/examples/README
+#usr/share/doc/libsoxr/examples/examples-common.h
diff --git a/lfs/libconfig b/lfs/libconfig
new file mode 100644
index 000000000..198e998bb
--- /dev/null
+++ b/lfs/libconfig
@@ -0,0 +1,78 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 1.7.2
+
+THISAPP = libconfig-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = d666f0ca093906d34d6e1e4890053e62
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && autoreconf -vfi
+ cd $(DIR_APP) && ./configure --prefix=/usr
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/shairport-sync b/lfs/shairport-sync
new file mode 100644
index 000000000..7703adc9f
--- /dev/null
+++ b/lfs/shairport-sync
@@ -0,0 +1,99 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 3.2.2
+
+THISAPP = shairport-sync-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = shairport-sync
+PAK_VER = 1
+
+DEPS = "alsa avahi soxr"
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = caf8a381b0623273de37a2c947703c50
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && autoreconf -vfi
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --with-alsa \
+ --with-avahi \
+ --with-ssl=openssl \
+ --with-soxr
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+
+ # Backup
+ install -v -m 644 $(DIR_SRC)/config/backup/includes/shairport-sync \
+ /var/ipfire/backup/addons/includes/shairport-sync
+
+ # Initscript
+ $(call INSTALL_INITSCRIPT,shairport-sync)
+
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/soxr b/lfs/soxr
new file mode 100644
index 000000000..261ab9081
--- /dev/null
+++ b/lfs/soxr
@@ -0,0 +1,86 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 0.1.3
+
+THISAPP = soxr-$(VER)
+DL_FILE = $(THISAPP)-Source.tar.xz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)-Source
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = soxr
+PAK_VER = 1
+
+DEPS = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 3f16f4dcb35b471682d4321eda6f6c08
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && mkdir -p build
+ cd $(DIR_APP)/build && cmake -Wno-dev \
+ -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
+ cd $(DIR_APP)/build && make $(MAKETUNING)
+ cd $(DIR_APP)/build && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 7e6975299..e9d143ccd 100755
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.21" # Version number
-CORE="125" # Core Level (Filename)
+CORE="126" # Core Level (Filename)
PAKFIRE_CORE="125" # Core Level (PAKFIRE)
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
@@ -1177,6 +1177,7 @@ buildipfire() {
lfsmake2 libassuan
lfsmake2 nettle
lfsmake2 json-c
+ lfsmake2 libconfig
lfsmake2 libevent
lfsmake2 libevent2
lfsmake2 expat
@@ -1372,6 +1373,7 @@ buildipfire() {
lfsmake2 flac
lfsmake2 lame
lfsmake2 sox
+ lfsmake2 soxr
lfsmake2 libshout
lfsmake2 xvid
lfsmake2 libmpeg2
@@ -1576,6 +1578,7 @@ buildipfire() {
lfsmake2 i2c-tools
lfsmake2 nss-myhostname
lfsmake2 dehydrated
+ lfsmake2 shairport-sync
}
buildinstaller() {
diff --git a/src/initscripts/packages/shairport-sync b/src/initscripts/packages/shairport-sync
new file mode 100755
index 000000000..a5d81a99d
--- /dev/null
+++ b/src/initscripts/packages/shairport-sync
@@ -0,0 +1,41 @@
+#!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/shairport-sync
+########################################################################
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+case "${1}" in
+ start)
+ boot_mesg "Starting Shairport Sync..."
+ loadproc /usr/bin/shairport-sync --daemon
+ ;;
+
+ stop)
+ boot_mesg "Stopping Shairport Sync..."
+ killproc /usr/bin/shairport-sync
+ ;;
+
+ reload)
+ boot_mesg "Reloading Shairport Sync..."
+ reloadproc /usr/bin/shairport-sync
+ ;;
+
+ restart)
+ ${0} stop
+ sleep 1
+ ${0} start
+ ;;
+
+ status)
+ statusproc /usr/bin/shairport-sync
+ ;;
+
+ *)
+ echo "Usage: ${0} {start|stop|reload|restart|status}"
+ exit 1
+ ;;
+esac
+
+# End $rc_base/init.d/shairport-sync
diff --git a/src/paks/shairport-sync/install.sh b/src/paks/shairport-sync/install.sh
new file mode 100644
index 000000000..dafd25c8c
--- /dev/null
+++ b/src/paks/shairport-sync/install.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+
+extract_files
+restore_backup ${NAME}
+
+# create startlinks
+ln -sf ../init.d/shairport-sync /etc/rc.d/rc0.d/K20shairport-sync
+ln -sf ../init.d/shairport-sync /etc/rc.d/rc3.d/S99shairport-sync
+ln -sf ../init.d/shairport-sync /etc/rc.d/rc6.d/K20shairport-sync
+
+# Start the service.
+start_service --background ${NAME}
+
+exit 0
diff --git a/src/paks/shairport-sync/uninstall.sh b/src/paks/shairport-sync/uninstall.sh
new file mode 100644
index 000000000..51c35a748
--- /dev/null
+++ b/src/paks/shairport-sync/uninstall.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+stop_service ${NAME}
+make_backup ${NAME}
+remove_files
+
+# Remove all start links.
+rm -rf /etc/rc.d/rc*.d/*shairport-sync
+
+exit 0
diff --git a/src/paks/shairport-sync/update.sh b/src/paks/shairport-sync/update.sh
new file mode 100644
index 000000000..c6485bf0a
--- /dev/null
+++ b/src/paks/shairport-sync/update.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+
+./uninstall.sh
+./install.sh
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2018-11-12 0:17 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181112001745.E584D1081BB0@git01.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox