From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. e0986954d46a287acf21cbc097ebe18948a026be
Date: Sat, 01 Dec 2018 16:13:38 +0000 [thread overview]
Message-ID: <20181201161339.556B984FDD6@people01.i.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 27642 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 e0986954d46a287acf21cbc097ebe18948a026be (commit)
via a4e3a76af9351765f24c18442bb9a479150f59bc (commit)
via b5b8920cf03cfed5d614672b9adcd194db6d4b9b (commit)
via e122256d8f989af5babe7ef2c8ebf9f5ddfa620b (commit)
via 9a127840472dafe1fe1ee7e3c2908a5edc5bf99a (commit)
via 046b436c763aeaab46058e643dea17dfaea2ec6d (commit)
via be7f989249a2a980bd9c7c51be646c11699aaf67 (commit)
from 4fc73ace764edbaea578688b81a5af200d5b30f7 (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 e0986954d46a287acf21cbc097ebe18948a026be
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Dec 1 16:12:44 2018 +0000
bird: Launch service on install and add symlinks to start at boot time
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a4e3a76af9351765f24c18442bb9a479150f59bc
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Dec 1 16:08:22 2018 +0000
bird: Add initscript
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b5b8920cf03cfed5d614672b9adcd194db6d4b9b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Dec 1 15:43:48 2018 +0000
bird: Add forgotten file
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e122256d8f989af5babe7ef2c8ebf9f5ddfa620b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Dec 1 15:43:26 2018 +0000
core126: Ship recently updated packages
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 9a127840472dafe1fe1ee7e3c2908a5edc5bf99a
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Tue Nov 13 18:50:48 2018 +0100
BUG 11929: Build 'bind'-binaries dynamically and install needed libraries (V2)
Hi,
To save space linking the 'bind 9.11.5'-binaries was changed from statically to dynamically.
Changes to V2:
Removed unnecessary '*.so'-links.
Complete file sizes shrinked from ~4800K to ~1700K. Needs testing and confirmation!
I'm running this version right now under Core 124 - no seen problems so far.
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 046b436c763aeaab46058e643dea17dfaea2ec6d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Dec 1 15:41:36 2018 +0000
bird: Update to 2.0.2
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit be7f989249a2a980bd9c7c51be646c11699aaf67
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Dec 1 15:33:36 2018 +0000
bird: Backup configuration file on update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/backup/includes/bird | 1 +
config/rootfiles/common/bind | 369 +++++++++++++++++++++
.../{oldcore/100 => core/126}/filelists/bind | 0
.../{oldcore/100 => core/126}/filelists/openssl | 0
.../120 => core/126}/filelists/openssl-compat | 0
config/rootfiles/packages/bird | 2 +
lfs/bind | 18 +-
lfs/bird | 14 +-
src/initscripts/{system/template => packages/bird} | 27 +-
src/paks/{haproxy => bird}/install.sh | 16 +-
src/paks/{frr => bird}/uninstall.sh | 2 +-
src/paks/{apcupsd => bird}/update.sh | 0
12 files changed, 415 insertions(+), 34 deletions(-)
create mode 100644 config/backup/includes/bird
copy config/rootfiles/{oldcore/100 => core/126}/filelists/bind (100%)
copy config/rootfiles/{oldcore/100 => core/126}/filelists/openssl (100%)
copy config/rootfiles/{oldcore/120 => core/126}/filelists/openssl-compat (100%)
copy src/initscripts/{system/template => packages/bird} (54%)
mode change 100644 => 100755
copy src/paks/{haproxy => bird}/install.sh (86%)
copy src/paks/{frr => bird}/uninstall.sh (98%)
copy src/paks/{apcupsd => bird}/update.sh (100%)
Difference in files:
diff --git a/config/backup/includes/bird b/config/backup/includes/bird
new file mode 100644
index 000000000..377010bed
--- /dev/null
+++ b/config/backup/includes/bird
@@ -0,0 +1 @@
+etc/bird.conf
diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind
index 303c5b828..7ddfab332 100644
--- a/config/rootfiles/common/bind
+++ b/config/rootfiles/common/bind
@@ -3,7 +3,376 @@ usr/bin/dig
usr/bin/host
usr/bin/nslookup
usr/bin/nsupdate
+#usr/include/bind9
+#usr/include/bind9/check.h
+#usr/include/bind9/getaddresses.h
+#usr/include/bind9/version.h
+#usr/include/dns
+#usr/include/dns/acache.h
+#usr/include/dns/acl.h
+#usr/include/dns/adb.h
+#usr/include/dns/badcache.h
+#usr/include/dns/bit.h
+#usr/include/dns/byaddr.h
+#usr/include/dns/cache.h
+#usr/include/dns/callbacks.h
+#usr/include/dns/catz.h
+#usr/include/dns/cert.h
+#usr/include/dns/client.h
+#usr/include/dns/clientinfo.h
+#usr/include/dns/compress.h
+#usr/include/dns/db.h
+#usr/include/dns/dbiterator.h
+#usr/include/dns/dbtable.h
+#usr/include/dns/diff.h
+#usr/include/dns/dispatch.h
+#usr/include/dns/dlz.h
+#usr/include/dns/dlz_dlopen.h
+#usr/include/dns/dns64.h
+#usr/include/dns/dnssec.h
+#usr/include/dns/dnstap.h
+#usr/include/dns/ds.h
+#usr/include/dns/dsdigest.h
+#usr/include/dns/dyndb.h
+#usr/include/dns/ecdb.h
+#usr/include/dns/edns.h
+#usr/include/dns/enumclass.h
+#usr/include/dns/enumtype.h
+#usr/include/dns/events.h
+#usr/include/dns/fixedname.h
+#usr/include/dns/forward.h
+#usr/include/dns/geoip.h
+#usr/include/dns/ipkeylist.h
+#usr/include/dns/iptable.h
+#usr/include/dns/journal.h
+#usr/include/dns/keydata.h
+#usr/include/dns/keyflags.h
+#usr/include/dns/keytable.h
+#usr/include/dns/keyvalues.h
+#usr/include/dns/lib.h
+#usr/include/dns/log.h
+#usr/include/dns/lookup.h
+#usr/include/dns/master.h
+#usr/include/dns/masterdump.h
+#usr/include/dns/message.h
+#usr/include/dns/name.h
+#usr/include/dns/ncache.h
+#usr/include/dns/nsec.h
+#usr/include/dns/nsec3.h
+#usr/include/dns/nta.h
+#usr/include/dns/opcode.h
+#usr/include/dns/order.h
+#usr/include/dns/peer.h
+#usr/include/dns/portlist.h
+#usr/include/dns/private.h
+#usr/include/dns/rbt.h
+#usr/include/dns/rcode.h
+#usr/include/dns/rdata.h
+#usr/include/dns/rdataclass.h
+#usr/include/dns/rdatalist.h
+#usr/include/dns/rdataset.h
+#usr/include/dns/rdatasetiter.h
+#usr/include/dns/rdataslab.h
+#usr/include/dns/rdatastruct.h
+#usr/include/dns/rdatatype.h
+#usr/include/dns/request.h
+#usr/include/dns/resolver.h
+#usr/include/dns/result.h
+#usr/include/dns/rootns.h
+#usr/include/dns/rpz.h
+#usr/include/dns/rriterator.h
+#usr/include/dns/rrl.h
+#usr/include/dns/sdb.h
+#usr/include/dns/sdlz.h
+#usr/include/dns/secalg.h
+#usr/include/dns/secproto.h
+#usr/include/dns/soa.h
+#usr/include/dns/ssu.h
+#usr/include/dns/stats.h
+#usr/include/dns/tcpmsg.h
+#usr/include/dns/time.h
+#usr/include/dns/timer.h
+#usr/include/dns/tkey.h
+#usr/include/dns/tsec.h
+#usr/include/dns/tsig.h
+#usr/include/dns/ttl.h
+#usr/include/dns/types.h
+#usr/include/dns/update.h
+#usr/include/dns/validator.h
+#usr/include/dns/version.h
+#usr/include/dns/view.h
+#usr/include/dns/xfrin.h
+#usr/include/dns/zone.h
+#usr/include/dns/zonekey.h
+#usr/include/dns/zt.h
+#usr/include/dst
+#usr/include/dst/dst.h
+#usr/include/dst/gssapi.h
+#usr/include/dst/lib.h
+#usr/include/dst/result.h
+#usr/include/isc
+#usr/include/isc/aes.h
+#usr/include/isc/app.h
+#usr/include/isc/assertions.h
+#usr/include/isc/atomic.h
+#usr/include/isc/backtrace.h
+#usr/include/isc/base32.h
+#usr/include/isc/base64.h
+#usr/include/isc/bind9.h
+#usr/include/isc/boolean.h
+#usr/include/isc/buffer.h
+#usr/include/isc/bufferlist.h
+#usr/include/isc/commandline.h
+#usr/include/isc/condition.h
+#usr/include/isc/counter.h
+#usr/include/isc/crc64.h
+#usr/include/isc/deprecated.h
+#usr/include/isc/dir.h
+#usr/include/isc/entropy.h
+#usr/include/isc/errno.h
+#usr/include/isc/error.h
+#usr/include/isc/event.h
+#usr/include/isc/eventclass.h
+#usr/include/isc/file.h
+#usr/include/isc/formatcheck.h
+#usr/include/isc/fsaccess.h
+#usr/include/isc/hash.h
+#usr/include/isc/heap.h
+#usr/include/isc/hex.h
+#usr/include/isc/hmacmd5.h
+#usr/include/isc/hmacsha.h
+#usr/include/isc/ht.h
+#usr/include/isc/httpd.h
+#usr/include/isc/int.h
+#usr/include/isc/interfaceiter.h
+#usr/include/isc/iterated_hash.h
+#usr/include/isc/json.h
+#usr/include/isc/keyboard.h
+#usr/include/isc/lang.h
+#usr/include/isc/lex.h
+#usr/include/isc/lfsr.h
+#usr/include/isc/lib.h
+#usr/include/isc/likely.h
+#usr/include/isc/list.h
+#usr/include/isc/log.h
+#usr/include/isc/magic.h
+#usr/include/isc/md5.h
+#usr/include/isc/mem.h
+#usr/include/isc/meminfo.h
+#usr/include/isc/msgcat.h
+#usr/include/isc/msgs.h
+#usr/include/isc/mutex.h
+#usr/include/isc/mutexblock.h
+#usr/include/isc/net.h
+#usr/include/isc/netaddr.h
+#usr/include/isc/netdb.h
+#usr/include/isc/netscope.h
+#usr/include/isc/offset.h
+#usr/include/isc/once.h
+#usr/include/isc/ondestroy.h
+#usr/include/isc/os.h
+#usr/include/isc/parseint.h
+#usr/include/isc/platform.h
+#usr/include/isc/pool.h
+#usr/include/isc/portset.h
+#usr/include/isc/print.h
+#usr/include/isc/queue.h
+#usr/include/isc/quota.h
+#usr/include/isc/radix.h
+#usr/include/isc/random.h
+#usr/include/isc/ratelimiter.h
+#usr/include/isc/refcount.h
+#usr/include/isc/regex.h
+#usr/include/isc/region.h
+#usr/include/isc/resource.h
+#usr/include/isc/result.h
+#usr/include/isc/resultclass.h
+#usr/include/isc/rwlock.h
+#usr/include/isc/safe.h
+#usr/include/isc/serial.h
+#usr/include/isc/sha1.h
+#usr/include/isc/sha2.h
+#usr/include/isc/sockaddr.h
+#usr/include/isc/socket.h
+#usr/include/isc/stat.h
+#usr/include/isc/stats.h
+#usr/include/isc/stdio.h
+#usr/include/isc/stdlib.h
+#usr/include/isc/stdtime.h
+#usr/include/isc/strerror.h
+#usr/include/isc/string.h
+#usr/include/isc/symtab.h
+#usr/include/isc/syslog.h
+#usr/include/isc/task.h
+#usr/include/isc/taskpool.h
+#usr/include/isc/thread.h
+#usr/include/isc/time.h
+#usr/include/isc/timer.h
+#usr/include/isc/tm.h
+#usr/include/isc/types.h
+#usr/include/isc/util.h
+#usr/include/isc/version.h
+#usr/include/isc/xml.h
+#usr/include/isccc
+#usr/include/isccc/alist.h
+#usr/include/isccc/base64.h
+#usr/include/isccc/cc.h
+#usr/include/isccc/ccmsg.h
+#usr/include/isccc/events.h
+#usr/include/isccc/lib.h
+#usr/include/isccc/result.h
+#usr/include/isccc/sexpr.h
+#usr/include/isccc/symtab.h
+#usr/include/isccc/symtype.h
+#usr/include/isccc/types.h
+#usr/include/isccc/util.h
+#usr/include/isccc/version.h
+#usr/include/isccfg
+#usr/include/isccfg/aclconf.h
+#usr/include/isccfg/cfg.h
+#usr/include/isccfg/dnsconf.h
+#usr/include/isccfg/grammar.h
+#usr/include/isccfg/log.h
+#usr/include/isccfg/namedconf.h
+#usr/include/isccfg/version.h
+#usr/include/lwres
+#usr/include/lwres/context.h
+#usr/include/lwres/int.h
+#usr/include/lwres/ipv6.h
+#usr/include/lwres/lang.h
+#usr/include/lwres/list.h
+#usr/include/lwres/lwbuffer.h
+#usr/include/lwres/lwpacket.h
+#usr/include/lwres/lwres.h
+#usr/include/lwres/net.h
+#usr/include/lwres/netdb.h
+#usr/include/lwres/platform.h
+#usr/include/lwres/result.h
+#usr/include/lwres/stdlib.h
+#usr/include/lwres/string.h
+#usr/include/lwres/version.h
+#usr/include/pk11
+#usr/include/pk11/constants.h
+#usr/include/pk11/internal.h
+#usr/include/pk11/pk11.h
+#usr/include/pk11/result.h
+#usr/include/pk11/site.h
+#usr/include/pkcs11
+#usr/include/pkcs11/cryptoki.h
+#usr/include/pkcs11/eddsa.h
+#usr/include/pkcs11/pkcs11.h
+#usr/include/pkcs11/pkcs11f.h
+#usr/include/pkcs11/pkcs11t.h
+#usr/lib/libbind9.la
+#usr/lib/libbind9.so
+usr/lib/libbind9.so.161
+usr/lib/libbind9.so.161.0.0
+#usr/lib/libdns.la
+#usr/lib/libdns.so
+usr/lib/libdns.so.1104
+usr/lib/libdns.so.1104.0.0
+#usr/lib/libisc.la
+#usr/lib/libisc.so
+usr/lib/libisc.so.1100
+usr/lib/libisc.so.1100.0.0
+#usr/lib/libisccc.la
+#usr/lib/libisccc.so
+usr/lib/libisccc.so.161
+usr/lib/libisccc.so.161.0.0
+#usr/lib/libisccfg.la
+#usr/lib/libisccfg.so
+usr/lib/libisccfg.so.163
+usr/lib/libisccfg.so.163.0.0
+#usr/lib/liblwres.la
+#usr/lib/liblwres.so
+usr/lib/liblwres.so.161
+usr/lib/liblwres.so.161.0.0
#usr/share/man/man1/dig.1
#usr/share/man/man1/host.1
#usr/share/man/man1/nslookup.1
#usr/share/man/man1/nsupdate.1
+#usr/share/man/man3/lwres.3
+#usr/share/man/man3/lwres_addr_parse.3
+#usr/share/man/man3/lwres_buffer.3
+#usr/share/man/man3/lwres_buffer_add.3
+#usr/share/man/man3/lwres_buffer_back.3
+#usr/share/man/man3/lwres_buffer_clear.3
+#usr/share/man/man3/lwres_buffer_first.3
+#usr/share/man/man3/lwres_buffer_forward.3
+#usr/share/man/man3/lwres_buffer_getmem.3
+#usr/share/man/man3/lwres_buffer_getuint16.3
+#usr/share/man/man3/lwres_buffer_getuint32.3
+#usr/share/man/man3/lwres_buffer_getuint8.3
+#usr/share/man/man3/lwres_buffer_init.3
+#usr/share/man/man3/lwres_buffer_invalidate.3
+#usr/share/man/man3/lwres_buffer_putmem.3
+#usr/share/man/man3/lwres_buffer_putuint16.3
+#usr/share/man/man3/lwres_buffer_putuint32.3
+#usr/share/man/man3/lwres_buffer_putuint8.3
+#usr/share/man/man3/lwres_buffer_subtract.3
+#usr/share/man/man3/lwres_conf_clear.3
+#usr/share/man/man3/lwres_conf_get.3
+#usr/share/man/man3/lwres_conf_init.3
+#usr/share/man/man3/lwres_conf_parse.3
+#usr/share/man/man3/lwres_conf_print.3
+#usr/share/man/man3/lwres_config.3
+#usr/share/man/man3/lwres_context.3
+#usr/share/man/man3/lwres_context_allocmem.3
+#usr/share/man/man3/lwres_context_create.3
+#usr/share/man/man3/lwres_context_destroy.3
+#usr/share/man/man3/lwres_context_freemem.3
+#usr/share/man/man3/lwres_context_initserial.3
+#usr/share/man/man3/lwres_context_nextserial.3
+#usr/share/man/man3/lwres_context_sendrecv.3
+#usr/share/man/man3/lwres_endhostent.3
+#usr/share/man/man3/lwres_endhostent_r.3
+#usr/share/man/man3/lwres_freeaddrinfo.3
+#usr/share/man/man3/lwres_freehostent.3
+#usr/share/man/man3/lwres_gabn.3
+#usr/share/man/man3/lwres_gabnrequest_free.3
+#usr/share/man/man3/lwres_gabnrequest_parse.3
+#usr/share/man/man3/lwres_gabnrequest_render.3
+#usr/share/man/man3/lwres_gabnresponse_free.3
+#usr/share/man/man3/lwres_gabnresponse_parse.3
+#usr/share/man/man3/lwres_gabnresponse_render.3
+#usr/share/man/man3/lwres_gai_strerror.3
+#usr/share/man/man3/lwres_getaddrinfo.3
+#usr/share/man/man3/lwres_getaddrsbyname.3
+#usr/share/man/man3/lwres_gethostbyaddr.3
+#usr/share/man/man3/lwres_gethostbyaddr_r.3
+#usr/share/man/man3/lwres_gethostbyname.3
+#usr/share/man/man3/lwres_gethostbyname2.3
+#usr/share/man/man3/lwres_gethostbyname_r.3
+#usr/share/man/man3/lwres_gethostent.3
+#usr/share/man/man3/lwres_gethostent_r.3
+#usr/share/man/man3/lwres_getipnode.3
+#usr/share/man/man3/lwres_getipnodebyaddr.3
+#usr/share/man/man3/lwres_getipnodebyname.3
+#usr/share/man/man3/lwres_getnamebyaddr.3
+#usr/share/man/man3/lwres_getnameinfo.3
+#usr/share/man/man3/lwres_getrrsetbyname.3
+#usr/share/man/man3/lwres_gnba.3
+#usr/share/man/man3/lwres_gnbarequest_free.3
+#usr/share/man/man3/lwres_gnbarequest_parse.3
+#usr/share/man/man3/lwres_gnbarequest_render.3
+#usr/share/man/man3/lwres_gnbaresponse_free.3
+#usr/share/man/man3/lwres_gnbaresponse_parse.3
+#usr/share/man/man3/lwres_gnbaresponse_render.3
+#usr/share/man/man3/lwres_herror.3
+#usr/share/man/man3/lwres_hstrerror.3
+#usr/share/man/man3/lwres_inetntop.3
+#usr/share/man/man3/lwres_lwpacket_parseheader.3
+#usr/share/man/man3/lwres_lwpacket_renderheader.3
+#usr/share/man/man3/lwres_net_ntop.3
+#usr/share/man/man3/lwres_noop.3
+#usr/share/man/man3/lwres_nooprequest_free.3
+#usr/share/man/man3/lwres_nooprequest_parse.3
+#usr/share/man/man3/lwres_nooprequest_render.3
+#usr/share/man/man3/lwres_noopresponse_free.3
+#usr/share/man/man3/lwres_noopresponse_parse.3
+#usr/share/man/man3/lwres_noopresponse_render.3
+#usr/share/man/man3/lwres_packet.3
+#usr/share/man/man3/lwres_resutil.3
+#usr/share/man/man3/lwres_sethostent.3
+#usr/share/man/man3/lwres_sethostent_r.3
+#usr/share/man/man3/lwres_string_parse.3
diff --git a/config/rootfiles/core/126/filelists/bind b/config/rootfiles/core/126/filelists/bind
new file mode 120000
index 000000000..48a0ebaef
--- /dev/null
+++ b/config/rootfiles/core/126/filelists/bind
@@ -0,0 +1 @@
+../../../common/bind
\ No newline at end of file
diff --git a/config/rootfiles/core/126/filelists/openssl b/config/rootfiles/core/126/filelists/openssl
new file mode 120000
index 000000000..e011a9266
--- /dev/null
+++ b/config/rootfiles/core/126/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/core/126/filelists/openssl-compat b/config/rootfiles/core/126/filelists/openssl-compat
new file mode 120000
index 000000000..c9fa42132
--- /dev/null
+++ b/config/rootfiles/core/126/filelists/openssl-compat
@@ -0,0 +1 @@
+../../../common/openssl-compat
\ No newline at end of file
diff --git a/config/rootfiles/packages/bird b/config/rootfiles/packages/bird
index fd2b8ecaa..b067132f3 100644
--- a/config/rootfiles/packages/bird
+++ b/config/rootfiles/packages/bird
@@ -1,4 +1,6 @@
etc/bird.conf
+etc/rc.d/init.d/bird
usr/sbin/bird
usr/sbin/birdc
usr/sbin/birdcl
+var/ipfire/backup/addons/includes/bird
diff --git a/lfs/bind b/lfs/bind
index d0fcfeda0..c2530b174 100644
--- a/lfs/bind
+++ b/lfs/bind
@@ -76,16 +76,16 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && STD_CDEFINES="$(CPPFLAGS)" \
./configure \
--prefix=/usr \
- --disable-static \
- --disable-openssl-version-check
- cd $(DIR_APP) && make -C lib/dns
- cd $(DIR_APP) && make -C lib/isc
- cd $(DIR_APP) && make -C lib/bind9
- cd $(DIR_APP) && make -C lib/isccfg
- cd $(DIR_APP) && make -C lib/lwres
- cd $(DIR_APP) && make -C bin/dig
+ --enable-threads \
+ --with-libtool \
+ --disable-static
+ cd $(DIR_APP) && make -C lib/isc install
+ cd $(DIR_APP) && make -C lib/dns install
+ cd $(DIR_APP) && make -C lib/isccc install
+ cd $(DIR_APP) && make -C lib/isccfg install
+ cd $(DIR_APP) && make -C lib/bind9 install
+ cd $(DIR_APP) && make -C lib/lwres install
cd $(DIR_APP) && make -C bin/dig install
- cd $(DIR_APP) && make -C bin/nsupdate
cd $(DIR_APP) && make -C bin/nsupdate install
install -v -m 644 $(DIR_SRC)/config/bind/trusted-key.key \
diff --git a/lfs/bird b/lfs/bird
index ae54ad2d6..84487a861 100644
--- a/lfs/bird
+++ b/lfs/bird
@@ -24,7 +24,7 @@
include Config
-VER = 1.6.3
+VER = 2.0.2
THISAPP = bird-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = bird
-PAK_VER = 2
+PAK_VER = 3
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 63dd93a7a23c274fc5b7f2e37664bfb7
+$(DL_FILE)_MD5 = de17645b045fa13912409aea59420132
install : $(TARGET)
@@ -85,6 +85,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--localstatedir=/var
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
+
+ # Install backup include
+ install -v -m 644 $(DIR_SRC)/config/backup/includes/bird \
+ /var/ipfire/backup/addons/includes/bird
+
+ # Install initscript
+ $(call INSTALL_INITSCRIPT,bird)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/src/initscripts/packages/bird b/src/initscripts/packages/bird
new file mode 100755
index 000000000..041db5edc
--- /dev/null
+++ b/src/initscripts/packages/bird
@@ -0,0 +1,41 @@
+#!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/bird
+########################################################################
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+case "${1}" in
+ start)
+ boot_mesg "Starting BIRD Internet Routing Daemon..."
+ loadproc /usr/sbin/bird
+ ;;
+
+ stop)
+ boot_mesg "Stopping BIRD Internet Routing Daemon..."
+ killproc /usr/sbin/bird
+ ;;
+
+ reload)
+ boot_mesg "Reloading BIRD Internet Routing Daemon..."
+ reloadproc /usr/sbin/bird
+ ;;
+
+ restart)
+ ${0} stop
+ sleep 1
+ ${0} start
+ ;;
+
+ status)
+ statusproc /usr/sbin/bird
+ ;;
+
+ *)
+ echo "Usage: ${0} {start|stop|reload|restart|status}"
+ exit 1
+ ;;
+esac
+
+# End $rc_base/init.d/bird
diff --git a/src/paks/bird/install.sh b/src/paks/bird/install.sh
new file mode 100644
index 000000000..e08745669
--- /dev/null
+++ b/src/paks/bird/install.sh
@@ -0,0 +1,40 @@
+#!/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
+extract_files
+
+# Restore any backups
+restore_backup "${NAME}"
+
+# Start services
+start_service "${NAME}"
+
+# Enable autostart
+ln -svf ../init.d/bird /etc/rc.d/rc0.d/K40bird
+ln -svf ../init.d/bird /etc/rc.d/rc3.d/S50bird
+ln -svf ../init.d/bird /etc/rc.d/rc6.d/K40bird
+
+exit 0
diff --git a/src/paks/bird/uninstall.sh b/src/paks/bird/uninstall.sh
new file mode 100644
index 000000000..4ba09c858
--- /dev/null
+++ b/src/paks/bird/uninstall.sh
@@ -0,0 +1,35 @@
+#!/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 services
+stop_service "${NAME}"
+
+# Create backup
+extract_backup_includes
+make_backup "${NAME}"
+
+# Remove all files
+rm -rfv /etc/rc.d/rc*.d/*bird
+remove_files
diff --git a/src/paks/bird/update.sh b/src/paks/bird/update.sh
new file mode 100644
index 000000000..89c40d0d7
--- /dev/null
+++ b/src/paks/bird/update.sh
@@ -0,0 +1,26 @@
+#!/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-12-01 16:13 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=20181201161339.556B984FDD6@people01.i.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