svc.startd (4.3) unstable; urgency=medium
* New upstream snapshot. * Refreshed patches. * New packages: svc.startd-dev, svc.startd-dbg, librestart1-dbg.
This commit is contained in:
Igor Pashev
parent
dcfc63c884
commit
2bf4006225
|
|
@ -1,3 +1,11 @@
|
|||
svc.startd (4.3) unstable; urgency=medium
|
||||
|
||||
* New upstream snapshot.
|
||||
* Refreshed patches.
|
||||
* New packages: svc.startd-dev, svc.startd-dbg, librestart1-dbg.
|
||||
|
||||
-- Igor Pashev <pashev.igor@gmail.com> Thu, 17 Apr 2014 19:24:52 +0400
|
||||
|
||||
svc.startd (2.10-5) unstable; urgency=low
|
||||
|
||||
* svc.startd should remove /reconfigure when it is done with it
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
Source: svc.startd
|
||||
Section: admin
|
||||
Priority: optional
|
||||
Priority: required
|
||||
Maintainer: Igor Pashev <pashev.igor@gmail.com>
|
||||
Build-Depends:
|
||||
dh-illumos,
|
||||
gcc-multilib,
|
||||
illumos-source-2.10,
|
||||
gcc-multilib [illumos-amd64],
|
||||
illumos-source-4.3,
|
||||
libnvpair1-dev , lib32nvpair1-dev [illumos-amd64] ,
|
||||
libpool1-dev , lib32pool1-dev [illumos-amd64] ,
|
||||
libproject1-dev , lib32project1-dev [illumos-amd64] ,
|
||||
|
|
@ -16,15 +16,12 @@ Build-Depends:
|
|||
libfmevent1-dev,
|
||||
quilt,
|
||||
symlinks,
|
||||
Standards-Version: 3.9.3
|
||||
Standards-Version: 3.9.5
|
||||
Homepage: https://www.illumos.org
|
||||
|
||||
Package: svc.startd
|
||||
Section: admin
|
||||
Priority: required
|
||||
Essential: yes
|
||||
Architecture: illumos-any
|
||||
Replaces: smf-base ( = 5.11.0-1~3 ), smf-init (= 5.11.0-1~5)
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}
|
||||
Description: service management facility master restarter
|
||||
svc.startd is the master restarter daemon for Service Management Facility
|
||||
|
|
@ -42,6 +39,32 @@ Description: service management facility master restarter
|
|||
system that creates a supported, unified model for services and service
|
||||
management on each system and replaces SysV init.d scripts.
|
||||
|
||||
Package: svc.startd-dev
|
||||
Priority: optional
|
||||
Architecture: illumos-any
|
||||
Depends: svc.startd (= ${binary:Version}), ${misc:Depends},
|
||||
librestart-dev, libscf-dev, libsysevent-dev, libumem-dev,
|
||||
Description: service management facility master restarter: header files
|
||||
This package provides header files to access svc.startd internals.
|
||||
.
|
||||
svc.startd is the master restarter daemon for Service Management Facility
|
||||
(SMF) and the default restarter for all services. svc.startd starts, stops,
|
||||
and restarts services based on administrative requests, system failures,
|
||||
or application failures.
|
||||
|
||||
Package: svc.startd-dbg
|
||||
Section: debug
|
||||
Priority: extra
|
||||
Architecture: illumos-any
|
||||
Depends: svc.startd (= ${binary:Version}), ${misc:Depends},
|
||||
Description: service management facility master restarter: debug info
|
||||
This package provides detached debug symbols for svc.startd
|
||||
.
|
||||
svc.startd is the master restarter daemon for Service Management Facility
|
||||
(SMF) and the default restarter for all services. svc.startd starts, stops,
|
||||
and restarts services based on administrative requests, system failures,
|
||||
or application failures.
|
||||
|
||||
Package: librestart1
|
||||
Section: libs
|
||||
Priority: optional
|
||||
|
|
@ -73,6 +96,14 @@ Description: SMF restarter library (development files)
|
|||
- a functional interface for updating the repository.
|
||||
- convenience functions for common restarter tasks.
|
||||
|
||||
Package: librestart1-dbg
|
||||
Section: debug
|
||||
Priority: extra
|
||||
Architecture: illumos-any
|
||||
Depends: librestart1 (= ${binary:Version}), ${misc:Depends},
|
||||
Description: SMF restarter library (debug info)
|
||||
This package contains detached debug symbols for the librestart library
|
||||
|
||||
Package: lib32restart1
|
||||
Section: libs
|
||||
Priority: optional
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
Index: svc.startd/usr/src/cmd/svc/startd/Makefile
|
||||
Index: b/usr/src/cmd/svc/startd/Makefile
|
||||
===================================================================
|
||||
--- svc.startd.orig/usr/src/cmd/svc/startd/Makefile 2012-10-08 04:25:33.000000000 +0400
|
||||
+++ svc.startd/usr/src/cmd/svc/startd/Makefile 2013-01-12 10:40:27.359417163 +0400
|
||||
--- a/usr/src/cmd/svc/startd/Makefile 2014-04-17 17:54:25.611862891 +0400
|
||||
+++ b/usr/src/cmd/svc/startd/Makefile 2014-04-17 17:54:40.845792315 +0400
|
||||
@@ -85,17 +85,15 @@
|
||||
LDLIBS += \
|
||||
-lcontract \
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
Index: svc.startd/usr/src/cmd/svc/startd/libscf.c
|
||||
Index: b/usr/src/cmd/svc/startd/libscf.c
|
||||
===================================================================
|
||||
--- svc.startd.orig/usr/src/cmd/svc/startd/libscf.c 2013-01-12 10:04:38.350481072 +0400
|
||||
+++ svc.startd/usr/src/cmd/svc/startd/libscf.c 2013-01-12 10:08:41.697302217 +0400
|
||||
--- a/usr/src/cmd/svc/startd/libscf.c 2014-04-17 17:54:32.732222454 +0400
|
||||
+++ b/usr/src/cmd/svc/startd/libscf.c 2014-04-17 17:54:36.211715467 +0400
|
||||
@@ -3136,7 +3136,7 @@
|
||||
*/
|
||||
int
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
Index: svc.startd/usr/src/cmd/svc/startd/graph.c
|
||||
Index: b/usr/src/cmd/svc/startd/graph.c
|
||||
===================================================================
|
||||
--- svc.startd.orig/usr/src/cmd/svc/startd/graph.c 2013-01-12 10:31:55.143883658 +0400
|
||||
+++ svc.startd/usr/src/cmd/svc/startd/graph.c 2013-01-12 10:35:27.563798430 +0400
|
||||
--- a/usr/src/cmd/svc/startd/graph.c 2014-04-17 17:54:32.728375964 +0400
|
||||
+++ b/usr/src/cmd/svc/startd/graph.c 2014-04-17 17:54:43.059574631 +0400
|
||||
@@ -3584,9 +3584,6 @@
|
||||
struct tm nowtm;
|
||||
char down_buf[256], time_buf[256];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@ Description: pointer's hell.
|
|||
- ctid_t is int, passed as void*
|
||||
- scf_value_get_integer() wants int64_t.
|
||||
- waitpid() wants int
|
||||
Index: svc.startd/usr/src/cmd/svc/startd/fork.c
|
||||
Index: b/usr/src/cmd/svc/startd/fork.c
|
||||
===================================================================
|
||||
--- svc.startd.orig/usr/src/cmd/svc/startd/fork.c 2012-10-08 04:25:33.000000000 +0400
|
||||
+++ svc.startd/usr/src/cmd/svc/startd/fork.c 2013-01-12 09:53:44.163306679 +0400
|
||||
@@ -483,7 +483,7 @@
|
||||
--- a/usr/src/cmd/svc/startd/fork.c 2014-04-17 17:54:27.978067021 +0400
|
||||
+++ b/usr/src/cmd/svc/startd/fork.c 2014-04-17 17:54:32.719894557 +0400
|
||||
@@ -494,7 +494,7 @@
|
||||
fork_configd_thread(void *vctid)
|
||||
{
|
||||
int fd, err;
|
||||
|
|
@ -15,10 +15,10 @@ Index: svc.startd/usr/src/cmd/svc/startd/fork.c
|
|||
|
||||
if (configd_ctid == -1) {
|
||||
log_framework(LOG_DEBUG,
|
||||
Index: svc.startd/usr/src/cmd/svc/startd/graph.c
|
||||
Index: b/usr/src/cmd/svc/startd/graph.c
|
||||
===================================================================
|
||||
--- svc.startd.orig/usr/src/cmd/svc/startd/graph.c 2012-10-08 04:25:33.000000000 +0400
|
||||
+++ svc.startd/usr/src/cmd/svc/startd/graph.c 2013-01-12 10:01:31.124244165 +0400
|
||||
--- a/usr/src/cmd/svc/startd/graph.c 2014-04-17 17:54:27.978137159 +0400
|
||||
+++ b/usr/src/cmd/svc/startd/graph.c 2014-04-17 17:54:32.728375964 +0400
|
||||
@@ -3588,7 +3588,7 @@
|
||||
grub_boot_args_t fbarg;
|
||||
#endif /* __i386 */
|
||||
|
|
@ -58,10 +58,10 @@ Index: svc.startd/usr/src/cmd/svc/startd/graph.c
|
|||
char *inst_name;
|
||||
|
||||
r = libscf_instance_get_fmri(inst, &inst_name);
|
||||
Index: svc.startd/usr/src/cmd/svc/startd/libscf.c
|
||||
Index: b/usr/src/cmd/svc/startd/libscf.c
|
||||
===================================================================
|
||||
--- svc.startd.orig/usr/src/cmd/svc/startd/libscf.c 2012-10-08 04:25:33.000000000 +0400
|
||||
+++ svc.startd/usr/src/cmd/svc/startd/libscf.c 2013-01-12 10:04:38.350481072 +0400
|
||||
--- a/usr/src/cmd/svc/startd/libscf.c 2014-04-17 17:54:27.978113521 +0400
|
||||
+++ b/usr/src/cmd/svc/startd/libscf.c 2014-04-17 17:54:32.732222454 +0400
|
||||
@@ -3142,7 +3142,7 @@
|
||||
scf_transaction_entry_t *e;
|
||||
scf_property_t *prop;
|
||||
|
|
@ -71,11 +71,11 @@ Index: svc.startd/usr/src/cmd/svc/startd/libscf.c
|
|||
int ret = 0, r;
|
||||
|
||||
t = safe_scf_transaction_create(h);
|
||||
Index: svc.startd/usr/src/cmd/svc/startd/method.c
|
||||
Index: b/usr/src/cmd/svc/startd/method.c
|
||||
===================================================================
|
||||
--- svc.startd.orig/usr/src/cmd/svc/startd/method.c 2013-01-12 10:14:49.794306657 +0400
|
||||
+++ svc.startd/usr/src/cmd/svc/startd/method.c 2013-01-12 10:17:38.171933633 +0400
|
||||
@@ -915,7 +915,7 @@
|
||||
--- a/usr/src/cmd/svc/startd/method.c 2014-04-17 17:54:27.978018684 +0400
|
||||
+++ b/usr/src/cmd/svc/startd/method.c 2014-04-17 17:54:32.734465554 +0400
|
||||
@@ -948,7 +948,7 @@
|
||||
MUTEX_UNLOCK(&inst->ri_lock);
|
||||
|
||||
do {
|
||||
|
|
@ -84,10 +84,10 @@ Index: svc.startd/usr/src/cmd/svc/startd/method.c
|
|||
} while (r == -1 && errno == EINTR);
|
||||
if (r == -1)
|
||||
err = errno;
|
||||
Index: svc.startd/usr/src/cmd/svc/startd/protocol.c
|
||||
Index: b/usr/src/cmd/svc/startd/protocol.c
|
||||
===================================================================
|
||||
--- svc.startd.orig/usr/src/cmd/svc/startd/protocol.c 2012-10-08 04:25:33.000000000 +0400
|
||||
+++ svc.startd/usr/src/cmd/svc/startd/protocol.c 2013-01-12 10:19:21.721184511 +0400
|
||||
--- a/usr/src/cmd/svc/startd/protocol.c 2014-04-17 17:54:27.978043183 +0400
|
||||
+++ b/usr/src/cmd/svc/startd/protocol.c 2014-04-17 17:54:32.736022843 +0400
|
||||
@@ -89,7 +89,7 @@
|
||||
|
||||
(void) pthread_mutex_init(&graph_queue->gpeq_lock, &mutex_attrs);
|
||||
|
|
@ -106,11 +106,11 @@ Index: svc.startd/usr/src/cmd/svc/startd/protocol.c
|
|||
|
||||
log_framework(LOG_DEBUG, "Initialized restarter protocol\n");
|
||||
}
|
||||
Index: svc.startd/usr/src/cmd/svc/startd/restarter.c
|
||||
Index: b/usr/src/cmd/svc/startd/restarter.c
|
||||
===================================================================
|
||||
--- svc.startd.orig/usr/src/cmd/svc/startd/restarter.c 2012-10-08 04:25:33.000000000 +0400
|
||||
+++ svc.startd/usr/src/cmd/svc/startd/restarter.c 2013-01-12 10:20:43.709814228 +0400
|
||||
@@ -1671,7 +1671,7 @@
|
||||
--- a/usr/src/cmd/svc/startd/restarter.c 2014-04-17 17:54:27.978090011 +0400
|
||||
+++ b/usr/src/cmd/svc/startd/restarter.c 2014-04-17 17:54:32.738614669 +0400
|
||||
@@ -1720,7 +1720,7 @@
|
||||
info->sf_id = rip->ri_id;
|
||||
info->sf_method_type = METHOD_REFRESH;
|
||||
info->sf_event_type = RERR_REFRESH;
|
||||
|
|
@ -119,10 +119,10 @@ Index: svc.startd/usr/src/cmd/svc/startd/restarter.c
|
|||
|
||||
assert(rip->ri_method_thread == 0);
|
||||
rip->ri_method_thread =
|
||||
Index: svc.startd/usr/src/cmd/svc/startd/startd.c
|
||||
Index: b/usr/src/cmd/svc/startd/startd.c
|
||||
===================================================================
|
||||
--- svc.startd.orig/usr/src/cmd/svc/startd/startd.c 2012-10-08 04:25:33.000000000 +0400
|
||||
+++ svc.startd/usr/src/cmd/svc/startd/startd.c 2013-01-12 10:23:00.915074986 +0400
|
||||
--- a/usr/src/cmd/svc/startd/startd.c 2014-04-17 17:54:27.977954877 +0400
|
||||
+++ b/usr/src/cmd/svc/startd/startd.c 2014-04-17 17:54:32.741329096 +0400
|
||||
@@ -466,7 +466,7 @@
|
||||
|
||||
/* Read reconfigure property for recovery. */
|
||||
|
|
@ -132,9 +132,9 @@ Index: svc.startd/usr/src/cmd/svc/startd/startd.c
|
|||
scf_property_get_value(prop, val) == 0)
|
||||
(void) scf_value_get_boolean(val, &prop_reconfig);
|
||||
|
||||
@@ -771,7 +771,7 @@
|
||||
log_framework(LOG_DEBUG, "Existing configd contract %ld; not "
|
||||
"starting svc.configd\n", configd_ctid);
|
||||
@@ -776,7 +776,7 @@
|
||||
*/
|
||||
utmpx_init();
|
||||
|
||||
- (void) startd_thread_create(fork_configd_thread, (void *)configd_ctid);
|
||||
+ (void) startd_thread_create(fork_configd_thread, (void *)(uintptr_t)configd_ctid);
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
Index: svc.startd/usr/src/cmd/svc/startd/method.c
|
||||
Index: b/usr/src/cmd/svc/startd/method.c
|
||||
===================================================================
|
||||
--- svc.startd.orig/usr/src/cmd/svc/startd/method.c 2013-01-12 10:17:38.171933633 +0400
|
||||
+++ svc.startd/usr/src/cmd/svc/startd/method.c 2013-01-12 10:17:53.715281457 +0400
|
||||
--- a/usr/src/cmd/svc/startd/method.c 2014-04-17 17:54:32.734465554 +0400
|
||||
+++ b/usr/src/cmd/svc/startd/method.c 2014-04-17 17:54:38.439937807 +0400
|
||||
@@ -63,7 +63,6 @@
|
||||
#include <libscf.h>
|
||||
#include <limits.h>
|
||||
|
|
@ -10,11 +10,11 @@ Index: svc.startd/usr/src/cmd/svc/startd/method.c
|
|||
#include <signal.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
Index: svc.startd/usr/src/cmd/svc/startd/utmpx.c
|
||||
Index: b/usr/src/cmd/svc/startd/utmpx.c
|
||||
===================================================================
|
||||
--- svc.startd.orig/usr/src/cmd/svc/startd/utmpx.c 2012-10-08 04:25:33.000000000 +0400
|
||||
+++ svc.startd/usr/src/cmd/svc/startd/utmpx.c 2013-01-12 10:26:08.799193882 +0400
|
||||
@@ -39,7 +39,6 @@
|
||||
--- a/usr/src/cmd/svc/startd/utmpx.c 2014-04-17 17:54:26.214080048 +0400
|
||||
+++ b/usr/src/cmd/svc/startd/utmpx.c 2014-04-17 17:54:38.442535191 +0400
|
||||
@@ -41,7 +41,6 @@
|
||||
#include <sys/stat.h>
|
||||
#include <errno.h>
|
||||
#include <pthread.h>
|
||||
|
|
@ -22,7 +22,7 @@ Index: svc.startd/usr/src/cmd/svc/startd/utmpx.c
|
|||
#include <string.h>
|
||||
#include <strings.h>
|
||||
#include <time.h>
|
||||
@@ -47,6 +46,10 @@
|
||||
@@ -49,6 +48,10 @@
|
||||
#include <utmpx.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
Description: it was job for /sbin/rcS, which is dead
|
||||
Index: svc.startd/usr/src/cmd/svc/startd/startd.c
|
||||
Index: b/usr/src/cmd/svc/startd/startd.c
|
||||
===================================================================
|
||||
--- svc.startd.orig/usr/src/cmd/svc/startd/startd.c 2013-01-20 01:50:38.032465802 +0000
|
||||
+++ svc.startd/usr/src/cmd/svc/startd/startd.c 2013-04-22 01:49:58.531868575 +0000
|
||||
--- a/usr/src/cmd/svc/startd/startd.c 2014-04-17 17:54:32.741329096 +0400
|
||||
+++ b/usr/src/cmd/svc/startd/startd.c 2014-04-17 17:54:45.258470734 +0400
|
||||
@@ -710,8 +710,10 @@
|
||||
return;
|
||||
|
||||
|
|
|
|||
|
|
@ -90,11 +90,13 @@ binary-stamp: install-stamp
|
|||
dh_installchangelogs
|
||||
dh_link
|
||||
dh_compress
|
||||
dh_fixperms
|
||||
dh_makeshlibs -- -c4
|
||||
dh_installdeb
|
||||
dh_shlibdeps
|
||||
dh_strip
|
||||
dh_strip -p svc.startd --dbg-package=svc.startd-dbg
|
||||
dh_strip -p librestart1 --dbg-package=librestart1-dbg
|
||||
dh_strip --remaining-packages
|
||||
dh_fixperms
|
||||
dh_gencontrol
|
||||
dh_md5sums
|
||||
dh_builddeb
|
||||
|
|
@ -103,6 +105,6 @@ binary-stamp: install-stamp
|
|||
clean: unpatch
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_clean
|
||||
rm -rf usr .pc
|
||||
dh_clean
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
usr/src/cmd/svc/startd/startd.h usr/include
|
||||
Loading…
Reference in New Issue