osdyson
/
illumos-packaging
mirror of https://git.osdyson.ru/illumos/illumos-packaging.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

svc.configd (4.3) unstable; urgency=medium 

* New upstream snapshot.
  * Dynamically link to libsqlite2
  * Refreshed svc.configd-integer.patch
  * New packages: svc.configd-dev, svc.configd-dbg, libscf1-dbg
This commit is contained in:
Igor Pashev 2014-04-17 13:10:45 +04:00
parent a20f48f1d3
commit 2d5c47069d
6 changed files with 78 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
svc.configd/debian/changelog
View File

@ -1,3 +1,12 @@
svc.configd (4.3) unstable; urgency=medium
* New upstream snapshot.
* Dynamically link to libsqlite2
* Refreshed svc.configd-integer.patch
* New packages: svc.configd-dev, svc.configd-dbg, libscf1-dbg
-- Igor Pashev <pashev.igor@gmail.com> Thu, 17 Apr 2014 13:03:21 +0400
svc.configd (2.10+7) unstable; urgency=low svc.configd (2.10+7) unstable; urgency=low
* Use P2ROUNDUP_TYPED macro in svc.configd-amd64-segfault.patch * Use P2ROUNDUP_TYPED macro in svc.configd-amd64-segfault.patch

56
svc.configd/debian/control
View File

@ -1,30 +1,27 @@
Source: svc.configd Source: svc.configd
Section: libs Section: admin
Priority: optional Priority: required
Maintainer: Igor Pashev <pashev.igor@gmail.com> Maintainer: Igor Pashev <pashev.igor@gmail.com>
Build-Depends: Build-Depends:
dh-illumos, dh-illumos,
gcc-multilib, gcc-multilib [illumos-amd64],
illumos-source-2.10, illumos-source-4.3,
libsmbios1-dev [illumos-amd64 illumos-i386], libsmbios1-dev [illumos-amd64 illumos-i386], lib32smbios1-dev [illumos-amd64],
lib32smbios1-dev [illumos-amd64 illumos-i386],
lib32nvpair1-dev [illumos-amd64], libnvpair1-dev, lib32nvpair1-dev [illumos-amd64], libnvpair1-dev,
lib32uutil1-dev [illumos-amd64], libuutil1-dev, lib32uutil1-dev [illumos-amd64], libuutil1-dev,
libbsm1-dev, libbsm1-dev,
libsqlite0-dev, libsqlite0-dev,
quilt, quilt,
symlinks, symlinks,
Standards-Version: 3.9.3 Standards-Version: 3.9.5
Homepage: https://www.illumos.org Homepage: https://www.illumos.org
Package: svc.configd Package: svc.configd
Section: admin
Priority: required Priority: required
Essential: yes Essential: yes
Architecture: illumos-any Architecture: illumos-any
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}
Built-Using: sqlite (= 2.8.17-7+dyson1)
Replaces: smf-init (= 5.11.0-1~5) Replaces: smf-init (= 5.11.0-1~5)
Description: service management facility repository daemon Description: service management facility repository daemon
svc.configd is the repository daemon for the Service Management Facility svc.configd is the repository daemon for the Service Management Facility
@ -38,9 +35,32 @@ Description: service management facility repository daemon
system that creates a supported, unified model for services and service system that creates a supported, unified model for services and service
management on each system and replaces SysV init.d scripts. management on each system and replaces SysV init.d scripts.
Package: svc.configd-dev
Priority: optional
Architecture: illumos-any
Depends: ${misc:Depends}, libscf-dev, libuutil-dev,
Description: service management facility repository daemon: headers files
This package provides header files to access svc.configd internals.
.
svc.configd is the repository daemon for the Service Management Facility
(SMF). svc.configd is invoked automatically during system startup, and
restarted if any failures occur.
Package: svc.configd-dbg
Priority: extra
Architecture: illumos-any
Depends: svc.configd (= ${binary:Version}), libscf1-dbg,
${misc:Depends}
Description: service management facility repository daemon: debug info
This package provides detached debug symbols for svc.configd.
.
svc.configd is the repository daemon for the Service Management Facility
(SMF). svc.configd is invoked automatically during system startup, and
restarted if any failures occur.
Package: libscf1 Package: libscf1
Section: libs Section: libs
Priority: standard Priority: optional
Multi-Arch: same Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends} Pre-Depends: ${misc:Pre-Depends}
Architecture: illumos-any Architecture: illumos-any
@ -55,12 +75,24 @@ Description: service configuration facility library
system that creates a supported, unified model for services and service system that creates a supported, unified model for services and service
management on each system and replaces SysV init.d scripts. management on each system and replaces SysV init.d scripts.
Package: libscf1-dbg
Section: libs
Priority: extra
Multi-Arch: same
Architecture: illumos-any
Depends: libscf1 (= ${binary:Version}), ${misc:Depends}
Description: service configuration facility library: debug info
This package contains detached debug symbols for libscf shared library.
.
The libscf library defines the interface for reading, writing, and
manipulating SMF service configurations.
Package: libscf1-dev Package: libscf1-dev
Section: libdevel Section: libdevel
Priority: optional Priority: optional
Architecture: illumos-any Architecture: illumos-any
Provides: libscf-dev Provides: libscf-dev
Depends: libscf1 (= ${binary:Version}), ${misc:Depends}, libc1-dev, Depends: libscf1 (= ${binary:Version}), ${misc:Depends},
libnvpair1-dev libnvpair1-dev
Description: service configuration facility library (development files) Description: service configuration facility library (development files)
This package contains the header files and symlinks needed This package contains the header files and symlinks needed
@ -75,7 +107,7 @@ Description: service configuration facility library (development files)
Package: lib32scf1 Package: lib32scf1
Section: libs Section: libs
Priority: standard Priority: optional
Architecture: illumos-amd64 Architecture: illumos-amd64
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}
Description: service configuration facility library (32 bit) Description: service configuration facility library (32 bit)

20
svc.configd/debian/patches/svc.configd-integer.patch
View File

@ -1,7 +1,7 @@
Index: libscf/usr/src/cmd/svc/configd/backend.c Index: svc.configd/usr/src/cmd/svc/configd/backend.c
=================================================================== ===================================================================
--- libscf.orig/usr/src/cmd/svc/configd/backend.c 2013-01-12 08:12:03.943861209 +0400 --- svc.configd.orig/usr/src/cmd/svc/configd/backend.c 2014-04-17 12:11:02.618855861 +0400
+++ libscf/usr/src/cmd/svc/configd/backend.c 2013-01-12 08:16:51.241009226 +0400 +++ svc.configd/usr/src/cmd/svc/configd/backend.c 2014-04-17 12:11:41.410707885 +0400
@@ -1585,7 +1585,7 @@ @@ -1585,7 +1585,7 @@
backend_switch_check(struct sqlite *be_db, char **errp) backend_switch_check(struct sqlite *be_db, char **errp)
{ {
@ -20,10 +20,10 @@ Index: libscf/usr/src/cmd/svc/configd/backend.c
struct run_single_int_info info; struct run_single_int_info info;
int fd; int fd;
Index: libscf/usr/src/cmd/svc/configd/file_object.c Index: svc.configd/usr/src/cmd/svc/configd/file_object.c
=================================================================== ===================================================================
--- libscf.orig/usr/src/cmd/svc/configd/file_object.c 2012-10-08 04:25:33.000000000 +0400 --- svc.configd.orig/usr/src/cmd/svc/configd/file_object.c 2014-04-17 12:11:02.619045740 +0400
+++ libscf/usr/src/cmd/svc/configd/file_object.c 2013-01-12 08:25:34.998535195 +0400 +++ svc.configd/usr/src/cmd/svc/configd/file_object.c 2014-04-17 12:11:41.415010067 +0400
@@ -1447,7 +1447,7 @@ @@ -1447,7 +1447,7 @@
propertygrp_delete_start, propertygrp_delete_start,
}, },
@ -33,11 +33,11 @@ Index: libscf/usr/src/cmd/svc/configd/file_object.c
}; };
#define NUM_INFO (sizeof (info) / sizeof (*info)) #define NUM_INFO (sizeof (info) / sizeof (*info))
Index: libscf/usr/src/cmd/svc/configd/rc_node.c Index: svc.configd/usr/src/cmd/svc/configd/rc_node.c
=================================================================== ===================================================================
--- libscf.orig/usr/src/cmd/svc/configd/rc_node.c 2012-10-08 04:25:33.000000000 +0400 --- svc.configd.orig/usr/src/cmd/svc/configd/rc_node.c 2014-04-17 12:11:02.619124894 +0400
+++ libscf/usr/src/cmd/svc/configd/rc_node.c 2013-01-12 08:26:33.244049473 +0400 +++ svc.configd/usr/src/cmd/svc/configd/rc_node.c 2014-04-17 12:11:41.425872613 +0400
@@ -424,7 +424,7 @@ @@ -425,7 +425,7 @@
{REP_PROTOCOL_ENTITY_CPROPERTYGRP, 0, UU_NAME_DOMAIN, {REP_PROTOCOL_ENTITY_CPROPERTYGRP, 0, UU_NAME_DOMAIN,
{REP_PROTOCOL_ENTITY_PROPERTY}}, {REP_PROTOCOL_ENTITY_PROPERTY}},
{REP_PROTOCOL_ENTITY_PROPERTY, 7, UU_NAME_DOMAIN}, {REP_PROTOCOL_ENTITY_PROPERTY, 7, UU_NAME_DOMAIN},

16
svc.configd/debian/patches/svc.configd-libsqlite.patch
View File

@ -1,7 +1,7 @@
Index: libscf/usr/src/cmd/svc/configd/Makefile Index: svc.configd/usr/src/cmd/svc/configd/Makefile
=================================================================== ===================================================================
--- libscf.orig/usr/src/cmd/svc/configd/Makefile 2012-10-08 04:25:33.000000000 +0400 --- svc.configd.orig/usr/src/cmd/svc/configd/Makefile 2014-03-01 16:18:04.000000000 +0400
+++ libscf/usr/src/cmd/svc/configd/Makefile 2013-01-12 08:35:57.388394852 +0400 +++ svc.configd/usr/src/cmd/svc/configd/Makefile 2014-04-17 12:11:32.688390408 +0400
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
ROOTCMDDIR= $(ROOT)/lib/svc/bin ROOTCMDDIR= $(ROOT)/lib/svc/bin
@ -16,11 +16,11 @@ Index: libscf/usr/src/cmd/svc/configd/Makefile
CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-uninitialized
MYLDLIBS = -lumem -luutil -lbsm MYLDLIBS = -lumem -luutil -lbsm
-LDLIBS += -lsecdb $(MYLDLIBS) -LDLIBS += -lsecdb $(MYLDLIBS)
+LDLIBS += -lsecdb $(MYLDLIBS) -Bstatic -lsqlite -Bdynamic +LDLIBS += -lsecdb $(MYLDLIBS) -lsqlite
LINTFLAGS += -errtags -erroff=E_BAD_FORMAT_ARG_TYPE2 -erroff=E_NAME_DEF_NOT_USED2 LINTFLAGS += -errtags -erroff=E_BAD_FORMAT_ARG_TYPE2 -erroff=E_NAME_DEF_NOT_USED2
CLOBBERFILES += $(MYPROG:%=%-native) CLOBBERFILES += $(MYPROG:%=%-native)
@@ -80,17 +80,11 @@ @@ -81,17 +81,11 @@
DIRMODE = 0755 DIRMODE = 0755
FILEMODE = 0555 FILEMODE = 0555
@ -38,10 +38,10 @@ Index: libscf/usr/src/cmd/svc/configd/Makefile
.KEEP_STATE: .KEEP_STATE:
.PARALLEL: $(MYOBJS) $(MYOBJS:%.o=%-native.o) .PARALLEL: $(MYOBJS) $(MYOBJS:%.o=%-native.o)
Index: libscf/usr/src/cmd/svc/configd/backend.c Index: svc.configd/usr/src/cmd/svc/configd/backend.c
=================================================================== ===================================================================
--- libscf.orig/usr/src/cmd/svc/configd/backend.c 2012-10-08 04:25:33.000000000 +0400 --- svc.configd.orig/usr/src/cmd/svc/configd/backend.c 2014-03-01 16:18:04.000000000 +0400
+++ libscf/usr/src/cmd/svc/configd/backend.c 2013-01-12 08:12:03.943861209 +0400 +++ svc.configd/usr/src/cmd/svc/configd/backend.c 2014-04-17 12:11:02.618855861 +0400
@@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
#include "repcache_protocol.h" #include "repcache_protocol.h"

8
svc.configd/debian/rules
View File

@ -88,19 +88,21 @@ binary-stamp: install-stamp
dh_installchangelogs dh_installchangelogs
dh_link dh_link
dh_compress dh_compress
dh_fixperms
dh_makeshlibs -- -c4 dh_makeshlibs -- -c4
dh_installdeb dh_installdeb
dh_shlibdeps dh_shlibdeps
dh_strip dh_strip -p libscf1 --dbg-package libscf1-dbg
dh_strip -p svc.configd --dbg-package svc.configd-dbg
dh_strip --remaining-packages
dh_gencontrol dh_gencontrol
dh_md5sums dh_md5sums
dh_fixperms
dh_builddeb dh_builddeb
touch $@ touch $@
clean: unpatch clean: unpatch
dh_testdir dh_testdir
dh_testroot dh_testroot
rm -rf usr .pc
dh_clean dh_clean
rm -rf usr

2
svc.configd/debian/svc.configd-dev.install Normal file
View File

@ -0,0 +1,2 @@
usr/src/cmd/svc/common/configd_exit.h usr/include
usr/src/cmd/svc/configd/configd.h usr/include