--- st-1.9.orig/debian/changelog +++ st-1.9/debian/changelog @@ -0,0 +1,106 @@ +st (1.9-3) unstable; urgency=low + + * Fixed doc-base registration for auxiliary documents. + + -- Wesley W. Terpstra (Debian) Sun, 01 Nov 2009 03:23:44 +0100 + +st (1.9-2) unstable; urgency=low + + * Switched to cdbs + * Appease lintian (homepage, description, symbols) + * Patch the library to hide all symbols of the form _st_* + * Added documentation to doc-base + + -- Wesley W. Terpstra (Debian) Sun, 01 Nov 2009 02:39:09 +0100 + +st (1.9-1) unstable; urgency=low + + * New upstream release (closes: #422103) + * Updated Standards-Version + + -- Wesley W. Terpstra (Debian) Tue, 20 Oct 2009 02:41:52 +0200 + +st (1.7-1) unstable; urgency=low + + * New upstream release (closes: #406394) + * Increased standards-version; no changes necessary + * Moved from DH_COMPAT level 2 to 5; no changes necessary + * Added linker options to indicate that an executable stack is not needed + * Downgraded optimization to -O2 + + -- Wesley W. Terpstra (Debian) Sun, 14 Jan 2007 21:36:45 +0100 + +st (1.5.1-2) unstable; urgency=low + + * Changed section to libdevel + + -- Wesley W. Terpstra (Debian) Sun, 29 Aug 2004 16:40:26 +0200 + +st (1.5.1-1) unstable; urgency=low + + * New upstream release + * Includes amd64 support (closes: #262301) + + -- Wesley W. Terpstra (Debian) Sun, 29 Aug 2004 15:52:25 +0200 + +st (1.4-1) unstable; urgency=low + + * New upstream release + * Old bug was closed long ago (closes: #138173) + + -- Wesley W. Terpstra (Debian) Sat, 4 Jan 2003 20:25:12 +0000 + +st (1.3pre4c-1) unstable; urgency=low + + * New upstream release: 1.4c (stable will be 1.4) + * Patches for s390 and hppa are upstream so dropped from the package. + + -- Wesley W. Terpstra (Debian) Sat, 26 Oct 2002 19:18:55 +0000 + +st (1.3pre4b-3) unstable; urgency=low + + * Added patch for s390 + + -- Wesley W. Terpstra (Debian) Sat, 26 Oct 2002 19:18:29 +0000 + +st (1.3pre4b-2) unstable; urgency=low + + * Fixed section override disparity + * Changed maintainer address to @debian.org + + -- Wesley W. Terpstra (Debian) Sun, 11 Aug 2002 17:46:10 +0000 + +st (1.3pre4b-1) unstable; urgency=low + + * New upstream release: 1.4b (stable will be 1.4) + * Include fix from Randolph Chung for hppa. (closes: #138173) Thanks! + + -- Wesley W. Terpstra (Debian) Sun, 11 Aug 2002 16:38:13 +0000 + +st (1.3-2) unstable; urgency=low + + * Added a conflicts with the sox-dev package and sox versions prior to the + split. This avoids the libst.a and st.h in sox. + * (closes: #132387) ITP + * Got the package to work on sparc. For some reason, when optimizing, we + must specify -finline-functions or else the optimization will cause the + context switch to crash. -O3 implies -finline-functions so use it. + * Use gcc for linking so that systems which need -lgcc get it. + * Stole code from mozilla to handle architectures of linux other than + those with canned JB_SP defines. + * mips is a pain; we have to use a custom MD_INIT_CONTEXT + * Builds now work on sparc, arm, alpha, powerpc, ia64, i386, mipsel, mips. + * Special thanks to Ryan Murray (neuro) for needed resources to port + libst to the above platforms! + + -- Wesley W. Terpstra Fri, 22 Feb 2002 03:47:28 +0000 + +st (1.3-1) unstable; urgency=low + + * Initial Release. + + -- Wesley W. Terpstra Sun, 9 Dec 2001 00:51:25 -0800 + +Local variables: +mode: debian-changelog +End: --- st-1.9.orig/debian/libst-dev.install +++ st-1.9/debian/libst-dev.install @@ -0,0 +1,6 @@ +obj/st.h usr/include +obj/lib*.so usr/lib +obj/lib*.a usr/lib +debian/st.pc usr/lib/pkgconfig +examples usr/share/doc/libst-dev +docs/* usr/share/doc/libst-dev --- st-1.9.orig/debian/libst-dev.doc-base.st-notes +++ st-1.9/debian/libst-dev.doc-base.st-notes @@ -0,0 +1,9 @@ +Document: st-notes +Title: State Threads Programming Notes +Author: Gene Shekhtman and Mike Abbott +Abstract: Programming notes for porting, signals, IPC, disk IO, and timeouts. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libst-dev/notes.html +Files: /usr/share/doc/libst-dev/notes.html --- st-1.9.orig/debian/compat +++ st-1.9/debian/compat @@ -0,0 +1 @@ +7 --- st-1.9.orig/debian/libst-dev.doc-base.st-reference +++ st-1.9/debian/libst-dev.doc-base.st-reference @@ -0,0 +1,9 @@ +Document: st-reference +Title: State Threads Library Reference +Author: Gene Shekhtman and Mike Abbott +Abstract: Documentation for all public methods and types in the state threads library. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libst-dev/reference.html +Files: /usr/share/doc/libst-dev/reference.html --- st-1.9.orig/debian/libst1.lintian-overrides +++ st-1.9/debian/libst1.lintian-overrides @@ -0,0 +1,3 @@ +# State-threads causes the program to exit when all threads terminate. +# exit() is not invoked as the result of an error condition. +libst1: shlib-calls-exit usr/lib/libst.so.1.9 --- st-1.9.orig/debian/copyright +++ st-1.9/debian/copyright @@ -0,0 +1,42 @@ +This package was debianized by Wesley W. Terpstra on +Sun Jan 6 18:20:46 PST 2002 + +It was downloaded from http://state-threads.sourceforge.net/ + +Upstream Authors: Gene Shekhtman + Mike Abbott + +Copyright: MPL 1.1 or GPL 2 + see /usr/share/common-licenses/GPL-2 + + * The contents of this file are subject to the Mozilla Public + * License Version 1.1 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS + * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + * implied. See the License for the specific language governing + * rights and limitations under the License. + * + * The Original Code is the Netscape Portable Runtime library. + * + * The Initial Developer of the Original Code is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1994-2000 Netscape Communications Corporation. All + * Rights Reserved. + * + * Contributor(s): Silicon Graphics, Inc. + * Yahoo! Inc. + * + * Alternatively, the contents of this file may be used under the + * terms of the GNU General Public License Version 2 or later (the + * "GPL"), in which case the provisions of the GPL are applicable + * instead of those above. If you wish to allow use of your + * version of this file only under the terms of the GPL and not to + * allow others to use your version of this file under the MPL, + * indicate your decision by deleting the provisions above and + * replace them with the notice and other provisions required by + * the GPL. If you do not delete the provisions above, a recipient + * may use your version of this file under either the MPL or the + * GPL. --- st-1.9.orig/debian/control +++ st-1.9/debian/control @@ -0,0 +1,44 @@ +Source: st +Section: devel +Priority: optional +Maintainer: Wesley W. Terpstra (Debian) +Build-Depends: debhelper (>= 7.0.0), cdbs (>= 0.4.52), autotools-dev +Standards-Version: 3.8.3.0 + +Package: libst-dev +Section: libdevel +Architecture: any +Depends: libst1 (= ${binary:Version}), ${misc:Depends}, libc6-dev +Recommends: pkg-config +Conflicts: sox (<= 12.17.2-1), sox-dev +Homepage: http://state-threads.sourceforge.net/ +Description: State Threads Library - Development files + The State Threads library has an interface similar to POSIX threads. + . + However, the threads are actually all run in-process. This type of + threading allows for controlled schedualing points. It is highly useful + for designing robust and extremely scalable internet applications since + there is no resource contention and locking is generally unnecessary. + . + It can be combined with traditional threading or multiple process + parallelism to take advantage of multiple processors. + . + This package contains the development files for compiling programs. + +Package: libst1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Homepage: http://state-threads.sourceforge.net/ +Description: State Threads Library + The State Threads library has an interface similar to POSIX threads. + . + However, the threads are actually all run in-process. This type of + threading allows for controlled schedualing points. It is highly useful + for designing robust and extremely scalable internet applications since + there is no resource contention and locking is generally unnecessary. + . + It can be combined with traditional threading or multiple process + parallelism to take advantage of multiple processors. + . + This package provides the library required by dependent programs. --- st-1.9.orig/debian/libst1.install +++ st-1.9/debian/libst1.install @@ -0,0 +1 @@ +obj/lib*.so.* usr/lib --- st-1.9.orig/debian/rules +++ st-1.9/debian/rules @@ -0,0 +1,17 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/makefile.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +DEB_MAKE_FLAGS = CC=gcc LD=gcc EXTRA_CFLAGS="$(CFLAGS) $(CPPFLAGS)" LDFLAGS="-shared -Wl,-soname=libst.so.1 -Wl,-z -Wl,noexecstack" +DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) $(MAKE) $(DEB_MAKE_FLAGS) +DEB_MAKE_BUILD_TARGET = default-optimized CONFIG_GUESS_PATH='/usr/share/misc' +DEB_COMPRESS_EXCLUDE = .c + +common-configure-arch:: + test "$(DEB_HOST_ARCH_OS)" = "linux" +install/libst-dev:: + sed "s*@prefix@*/usr*g" debian/st.pc +clean:: + rm -f debian/st.pc --- st-1.9.orig/debian/libst1.symbols +++ st-1.9/debian/libst1.symbols @@ -0,0 +1,63 @@ +libst.so.1 libst1 #MINVER# +* Build-Depends-Package: libst-dev + st_accept@Base 1.9 + st_cond_broadcast@Base 1.9 + st_cond_destroy@Base 1.9 + st_cond_new@Base 1.9 + st_cond_signal@Base 1.9 + st_cond_timedwait@Base 1.9 + st_cond_wait@Base 1.9 + st_connect@Base 1.9 + st_get_eventsys@Base 1.9 + st_get_eventsys_name@Base 1.9 + st_getfdlimit@Base 1.9 + st_init@Base 1.9 + st_key_create@Base 1.9 + st_key_getlimit@Base 1.9 + st_mutex_destroy@Base 1.9 + st_mutex_lock@Base 1.9 + st_mutex_new@Base 1.9 + st_mutex_trylock@Base 1.9 + st_mutex_unlock@Base 1.9 + st_netfd_close@Base 1.9 + st_netfd_fileno@Base 1.9 + st_netfd_free@Base 1.9 + st_netfd_getspecific@Base 1.9 + st_netfd_open@Base 1.9 + st_netfd_open_socket@Base 1.9 + st_netfd_poll@Base 1.9 + st_netfd_serialize_accept@Base 1.9 + st_netfd_setspecific@Base 1.9 + st_open@Base 1.9 + st_poll@Base 1.9 + st_randomize_stacks@Base 1.9 + st_read@Base 1.9 + st_read_fully@Base 1.9 + st_read_resid@Base 1.9 + st_readv@Base 1.9 + st_readv_resid@Base 1.9 + st_recvfrom@Base 1.9 + st_recvmsg@Base 1.9 + st_sendmsg@Base 1.9 + st_sendto@Base 1.9 + st_set_eventsys@Base 1.9 + st_set_switch_in_cb@Base 1.9 + st_set_switch_out_cb@Base 1.9 + st_set_utime_function@Base 1.9 + st_sleep@Base 1.9 + st_thread_create@Base 1.9 + st_thread_exit@Base 1.9 + st_thread_getspecific@Base 1.9 + st_thread_interrupt@Base 1.9 + st_thread_join@Base 1.9 + st_thread_self@Base 1.9 + st_thread_setspecific@Base 1.9 + st_time@Base 1.9 + st_timecache_set@Base 1.9 + st_usleep@Base 1.9 + st_utime@Base 1.9 + st_utime_last_clock@Base 1.9 + st_write@Base 1.9 + st_write_resid@Base 1.9 + st_writev@Base 1.9 + st_writev_resid@Base 1.9 --- st-1.9.orig/debian/watch +++ st-1.9/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://sf.net/state-threads/st-([\d\.]+)\.tar\.gz --- st-1.9.orig/debian/libst-dev.doc-base.st-performance +++ st-1.9/debian/libst-dev.doc-base.st-performance @@ -0,0 +1,9 @@ +Document: st-performance +Title: State Threads for Internet Applications +Author: Gene Shekhtman and Mike Abbott +Abstract: State Threads improve scalability in Internet applications by combining the simplicity of multithreaded programming paradigm with the scalability of an event-driven state machine. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libst-dev/st.html +Files: /usr/share/doc/libst-dev/st.html --- st-1.9.orig/debian/patches/01-private-symbols.patch +++ st-1.9/debian/patches/01-private-symbols.patch @@ -0,0 +1,153 @@ +diff -Nur -x '*.orig' -x '*~' st-1.9/common.h st-1.9.new/common.h +--- st-1.9/common.h 2009-11-01 02:36:41.000000000 +0100 ++++ st-1.9.new/common.h 2009-11-01 02:37:14.000000000 +0100 +@@ -252,9 +252,12 @@ + * Current vp, thread, and event system + */ + +-extern _st_vp_t _st_this_vp; +-extern _st_thread_t *_st_this_thread; +-extern _st_eventsys_t *_st_eventsys; ++ST_PRIVATE extern _st_vp_t _st_this_vp; ++ST_PRIVATE extern _st_thread_t *_st_this_thread; ++ST_PRIVATE extern _st_eventsys_t *_st_eventsys; ++ST_PRIVATE extern int _st_active_count; ++ST_PRIVATE extern time_t _st_curr_time; ++ST_PRIVATE extern st_utime_t _st_last_tset; + + #define _ST_CURRENT_THREAD() (_st_this_thread) + #define _ST_SET_CURRENT_THREAD(_thread) (_st_this_thread = (_thread)) +@@ -439,16 +442,15 @@ + * Forward declarations + */ + +-void _st_vp_schedule(void); +-void _st_vp_check_clock(void); +-void *_st_idle_thread_start(void *arg); +-void _st_thread_main(void); +-void _st_thread_cleanup(_st_thread_t *thread); +-void _st_add_sleep_q(_st_thread_t *thread, st_utime_t timeout); +-void _st_del_sleep_q(_st_thread_t *thread); +-_st_stack_t *_st_stack_new(int stack_size); +-void _st_stack_free(_st_stack_t *ts); +-int _st_io_init(void); ++ST_PRIVATE void _st_vp_schedule(void); ++ST_PRIVATE void _st_vp_check_clock(void); ++ST_PRIVATE void *_st_idle_thread_start(void *arg); ++ST_PRIVATE void _st_thread_cleanup(_st_thread_t *thread); ++ST_PRIVATE void _st_add_sleep_q(_st_thread_t *thread, st_utime_t timeout); ++ST_PRIVATE void _st_del_sleep_q(_st_thread_t *thread); ++ST_PRIVATE _st_stack_t *_st_stack_new(int stack_size); ++ST_PRIVATE void _st_stack_free(_st_stack_t *ts); ++ST_PRIVATE int _st_io_init(void); + + st_utime_t st_utime(void); + _st_cond_t *st_cond_new(void); +diff -Nur -x '*.orig' -x '*~' st-1.9/md.h st-1.9.new/md.h +--- st-1.9/md.h 2009-11-01 02:37:12.000000000 +0100 ++++ st-1.9.new/md.h 2009-11-01 02:37:14.000000000 +0100 +@@ -54,6 +54,12 @@ + #define MAP_FAILED -1 + #endif + ++#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) ++#define ST_PRIVATE __attribute__((visibility("hidden"))) ++#else ++#define ST_PRIVATE ++#endif ++ + /***************************************** + * Platform specifics + */ +@@ -460,8 +466,8 @@ + #define MD_SETJMP(env) _st_md_cxt_save(env) + #define MD_LONGJMP(env, val) _st_md_cxt_restore(env, val) + +-extern int _st_md_cxt_save(jmp_buf env); +-extern void _st_md_cxt_restore(jmp_buf env, int val); ++ST_PRIVATE extern int _st_md_cxt_save(jmp_buf env); ++ST_PRIVATE extern void _st_md_cxt_restore(jmp_buf env, int val); + #else + #define MD_SETJMP(env) setjmp(env) + #define MD_LONGJMP(env, val) longjmp(env, val) +diff -Nur -x '*.orig' -x '*~' st-1.9/md.S st-1.9.new/md.S +--- st-1.9/md.S 2009-11-01 02:36:41.000000000 +0100 ++++ st-1.9.new/md.S 2009-11-01 02:37:14.000000000 +0100 +@@ -302,6 +302,7 @@ + + /* _st_md_cxt_save(__jmp_buf env) */ + .globl _st_md_cxt_save ++.hidden _st_md_cxt_save + .type _st_md_cxt_save, @function + .align 16 + _st_md_cxt_save: +@@ -330,6 +331,7 @@ + + /* _st_md_cxt_restore(__jmp_buf env, int val) */ + .globl _st_md_cxt_restore ++.hidden _st_md_cxt_restore + .type _st_md_cxt_restore, @function + .align 16 + _st_md_cxt_restore: +@@ -375,6 +377,7 @@ + + /* _st_md_cxt_save(__jmp_buf env) */ + .globl _st_md_cxt_save ++.hidden _st_md_cxt_save + .type _st_md_cxt_save, @function + .align 16 + _st_md_cxt_save: +@@ -402,6 +405,7 @@ + + /* _st_md_cxt_restore(__jmp_buf env, int val) */ + .globl _st_md_cxt_restore ++.hidden _st_md_cxt_restore + .type _st_md_cxt_restore, @function + .align 16 + _st_md_cxt_restore: +diff -Nur -x '*.orig' -x '*~' st-1.9/sched.c st-1.9.new/sched.c +--- st-1.9/sched.c 2009-10-02 02:22:17.000000000 +0200 ++++ st-1.9.new/sched.c 2009-11-01 02:37:35.000000000 +0100 +@@ -312,7 +312,7 @@ + } + + +-void _st_thread_main(void) ++ST_HIDDEN void _st_thread_main(void) + { + _st_thread_t *thread = _ST_CURRENT_THREAD(); + +diff -Nur -x '*.orig' -x '*~' st-1.9/stk.c st-1.9.new/stk.c +--- st-1.9/stk.c 2009-11-01 02:36:41.000000000 +0100 ++++ st-1.9.new/stk.c 2009-11-01 02:37:14.000000000 +0100 +@@ -50,9 +50,9 @@ + /* How much space to leave between the stacks, at each end */ + #define REDZONE _ST_PAGE_SIZE + +-_st_clist_t _st_free_stacks = ST_INIT_STATIC_CLIST(&_st_free_stacks); +-int _st_num_free_stacks = 0; +-int _st_randomize_stacks = 0; ++ST_HIDDEN _st_clist_t _st_free_stacks = ST_INIT_STATIC_CLIST(&_st_free_stacks); ++ST_HIDDEN int _st_num_free_stacks = 0; ++ST_HIDDEN int _st_randomize_stacks = 0; + + static char *_st_new_stk_segment(int size); + +diff -Nur -x '*.orig' -x '*~' st-1.9/sync.c st-1.9.new/sync.c +--- st-1.9/sync.c 2009-11-01 02:36:41.000000000 +0100 ++++ st-1.9.new/sync.c 2009-11-01 02:37:14.000000000 +0100 +@@ -44,14 +44,8 @@ + #include + #include "common.h" + +- +-extern time_t _st_curr_time; +-extern st_utime_t _st_last_tset; +-extern int _st_active_count; +- + static st_utime_t (*_st_utime)(void) = NULL; + +- + /***************************************** + * Time functions + */ --- st-1.9.orig/debian/patches/00-kfreebsd.patch +++ st-1.9/debian/patches/00-kfreebsd.patch @@ -0,0 +1,37 @@ +diff -Nur -x '*.orig' -x '*~' st-1.9/examples/Makefile st-1.9.new/examples/Makefile +--- st-1.9/examples/Makefile 2009-10-01 20:35:55.000000000 +0200 ++++ st-1.9.new/examples/Makefile 2009-10-29 03:12:42.000000000 +0100 +@@ -82,6 +82,10 @@ + LIBRESOLV = -lresolv + endif + ++ifeq (FREEBSD, $(findstring FREEBSD, $(OS))) ++LIBRESOLV = -lresolv ++endif ++ + ifeq (LINUX, $(findstring LINUX, $(OS))) + LIBRESOLV = -lresolv + endif +diff -Nur -x '*.orig' -x '*~' st-1.9/md.h st-1.9.new/md.h +--- st-1.9/md.h 2009-10-01 20:46:43.000000000 +0200 ++++ st-1.9.new/md.h 2009-10-29 03:16:08.000000000 +0100 +@@ -169,7 +169,7 @@ + ST_BEGIN_MACRO \ + if (MD_SETJMP((_thread)->context)) \ + _main(); \ +- (_thread)->context[0]._jb[MD_JB_SP] = (long) (_sp); \ ++ (_thread)->context[0].__jmpbuf[MD_JB_SP] = (long) (_sp); \ + ST_END_MACRO + + #define MD_GET_UTIME() \ +diff -Nur -x '*.orig' -x '*~' st-1.9/osguess.sh st-1.9.new/osguess.sh +--- st-1.9/osguess.sh 2006-05-05 08:03:27.000000000 +0200 ++++ st-1.9.new/osguess.sh 2009-10-29 03:13:11.000000000 +0100 +@@ -28,6 +28,7 @@ + case "$sys_info" in + *-ibm-aix4* ) OS=AIX ;; + *-freebsd* ) OS=FREEBSD ;; ++ *-kfreebsd* ) OS=FREEBSD ;; + hppa*-hp-hpux11*) OS=HPUX ;; + *-sgi-irix6* ) OS=IRIX ;; + *-linux* ) OS=LINUX ;;