pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Rename taskserver to taskd
Module Name: pkgsrc-wip
Committed By: Thomas Merkel <tm%core.io@localhost>
Pushed By: drscream
Date: Tue Aug 22 15:49:11 2017 +0200
Changeset: c78a0bbff9a57ef0f5f538c35b6aabf3e5f60532
Modified Files:
Makefile
Added Files:
taskd/DESCR
taskd/MESSAGE
taskd/Makefile
taskd/PLIST
taskd/distinfo
taskd/files/smf/manifest.xml
taskd/patches/patch-src_TLSServer.cpp
Removed Files:
taskserver/DESCR
taskserver/MESSAGE
taskserver/Makefile
taskserver/PLIST
taskserver/distinfo
taskserver/files/smf/manifest.xml
taskserver/patches/patch-src_TLSServer.cpp
Log Message:
Rename taskserver to taskd
Based on the package name, official name and named packages at other distributions we should be using the same folder name.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c78a0bbff9a57ef0f5f538c35b6aabf3e5f60532
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 2 +-
taskd/DESCR | 3 ++
taskd/MESSAGE | 14 ++++++++
taskd/Makefile | 56 ++++++++++++++++++++++++++++++
taskd/PLIST | 18 ++++++++++
taskd/distinfo | 7 ++++
taskd/files/smf/manifest.xml | 36 +++++++++++++++++++
taskd/patches/patch-src_TLSServer.cpp | 15 ++++++++
taskserver/DESCR | 3 --
taskserver/MESSAGE | 14 --------
taskserver/Makefile | 56 ------------------------------
taskserver/PLIST | 18 ----------
taskserver/distinfo | 7 ----
taskserver/files/smf/manifest.xml | 36 -------------------
taskserver/patches/patch-src_TLSServer.cpp | 15 --------
15 files changed, 150 insertions(+), 150 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 5b1143a6c9..82aa4bf2de 100644
--- a/Makefile
+++ b/Makefile
@@ -4234,7 +4234,7 @@ SUBDIR+= tamago-tsunagi
SUBDIR+= tardy
SUBDIR+= taskcoach
SUBDIR+= tasks
-SUBDIR+= taskserver
+SUBDIR+= taskd
SUBDIR+= tc-git
SUBDIR+= tc-hasida-table
SUBDIR+= tcc
diff --git a/taskd/DESCR b/taskd/DESCR
new file mode 100644
index 0000000000..23ef9c0fd0
--- /dev/null
+++ b/taskd/DESCR
@@ -0,0 +1,3 @@
+The Taskserver is a lightweight, secure server providing multi-user,
+multi-client access to task data. This allows true syncing between
+desktop and mobile clients.
diff --git a/taskd/MESSAGE b/taskd/MESSAGE
new file mode 100644
index 0000000000..5c73938fa7
--- /dev/null
+++ b/taskd/MESSAGE
@@ -0,0 +1,14 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.0 2017/08/21 16:04:13 drscream Exp $
+
+Be sure you initialize the ${PKGNAME} server in the TASKDDATA directory:
+
+ export TASKDDATA=${TASKD_DATA}
+ taskd init
+
+Follow additional steps to configure the SSL certificates and keys on the
+official website:
+
+https://taskwarrior.org/docs/taskserver/configure.html
+
+===========================================================================
diff --git a/taskd/Makefile b/taskd/Makefile
new file mode 100644
index 0000000000..a7ab2d5c61
--- /dev/null
+++ b/taskd/Makefile
@@ -0,0 +1,56 @@
+# $NetBSD$
+
+DISTNAME= taskd-1.1.0
+PKGREVISION= 2
+CATEGORIES= net
+MASTER_SITES= http://taskwarrior.org/download/
+
+MAINTAINER= esg%sdf.org@localhost
+HOMEPAGE= http://taskwarrior.org/download/
+COMMENT= Lightweight, secure server providing access to task data
+LICENSE= mit
+
+USE_CMAKE= yes
+USE_LANGUAGES= c c++
+
+CMAKE_ARGS+= -DTASKD_MAN1DIR=${PREFIX}/${PKGMANDIR}/man1
+CMAKE_ARGS+= -DTASKD_MAN5DIR=${PREFIX}/${PKGMANDIR}/man5
+
+LDFLAGS.SunOS+= -lsocket -lnsl
+
+.include "../../mk/bsd.prefs.mk"
+SMF_NAME= taskd
+TASKD_USER?= taskd
+TASKD_GROUP?= taskd
+TASKD_DATA?= ${VARBASE}/taskd
+PKG_GROUPS= ${TASKD_GROUP}
+PKG_USERS= ${TASKD_USER}:${TASKD_GROUP}
+PKG_GROUPS_VARS= TASKD_USER
+PKG_USERS_VARS= TASKD_GROUP
+PKG_HOME.${TASKD_USER}= ${TASKD_DATA}
+
+FILES_SUBST+= TASKD_USER=${TASKD_USER} TASKD_GROUP=${TASKD_GROUP} \
+ TASKD_DATA=${TASKD_DATA}
+MESSAGE_SUBST+= TASKD_DATA=${TASKD_DATA}
+
+EGDIR= ${PREFIX}/share/examples/taskd
+EGFILES+= pki/README pki/generate pki/generate.ca \
+ pki/generate.client pki/generate.crl \
+ pki/generate.server pki/vars
+INSTALLATION_DIRS+= ${EGDIR}/pki
+
+BUILD_DEFS+= TASKD_USER TASKD_GROUP TASKD_DATA VARBASE
+
+REPLACE_SH= src/taskdctl
+
+MAKE_DIRS=+ ${TASKD_DATA}
+OWN_DIRS_PERMS+= ${TASKD_DATA} ${TASKD_USER} ${TASKD_GROUP} 0750
+
+post-install:
+.for file in ${EGFILES}
+ ${INSTALL_DATA} ${WRKSRC}/${file} ${DESTDIR}${EGDIR}/${file}
+.endfor
+
+.include "../../devel/libuuid/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/taskd/PLIST b/taskd/PLIST
new file mode 100644
index 0000000000..cfda7c418b
--- /dev/null
+++ b/taskd/PLIST
@@ -0,0 +1,18 @@
+@comment $NetBSD$
+bin/taskd
+bin/taskdctl
+man/man1/taskd.1
+man/man1/taskdctl.1
+man/man5/taskdrc.5
+share/doc/taskd/AUTHORS
+share/doc/taskd/COPYING
+share/doc/taskd/ChangeLog
+share/doc/taskd/INSTALL
+share/doc/taskd/NEWS
+share/examples/taskd/pki/README
+share/examples/taskd/pki/generate
+share/examples/taskd/pki/generate.ca
+share/examples/taskd/pki/generate.client
+share/examples/taskd/pki/generate.crl
+share/examples/taskd/pki/generate.server
+share/examples/taskd/pki/vars
diff --git a/taskd/distinfo b/taskd/distinfo
new file mode 100644
index 0000000000..3662c35b6e
--- /dev/null
+++ b/taskd/distinfo
@@ -0,0 +1,7 @@
+$NetBSD$
+
+SHA1 (taskd-1.1.0.tar.gz) = ded339deeee65277e4712f71a9159502f8b20b52
+RMD160 (taskd-1.1.0.tar.gz) = f5256fda0de4dc46a4f09167666e81bed3452f69
+SHA512 (taskd-1.1.0.tar.gz) = df2349c354258fd1b014b1a9c78f68dc10c9e5a48357e282e8a760cf4e4aaf4d36486796ad094ee2b050e7506195b778e3316c90ef543a2f8242de313daa13aa
+Size (taskd-1.1.0.tar.gz) = 120115 bytes
+SHA1 (patch-src_TLSServer.cpp) = 6e47c0ef59dc6c265539152b7abce75b5e518d45
diff --git a/taskd/files/smf/manifest.xml b/taskd/files/smf/manifest.xml
new file mode 100644
index 0000000000..b2cecb240e
--- /dev/null
+++ b/taskd/files/smf/manifest.xml
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
+<service_bundle type='manifest' name='export'>
+ <service name='@SMF_PREFIX@/@SMF_NAME@' type='service' version='0'>
+ <dependency name='net-physical' grouping='require_all' restart_on='none' type='service'>
+ <service_fmri value='svc:/network/physical'/>
+ </dependency>
+ <dependency name='filesystem' grouping='require_all' restart_on='none' type='service'>
+ <service_fmri value='svc:/system/filesystem/local'/>
+ </dependency>
+ <exec_method name='start' type='method' exec='@PREFIX@/bin/taskd server --data %{config/taskdata}' timeout_seconds='0'/>
+ <exec_method name='stop' type='method' exec=':kill' timeout_seconds='10'/>
+ <exec_method name='refresh' type='method' exec=':kill -HUP' timeout_seconds='60'/>
+ <property_group name='startd' type='framework'>
+ <propval name='duration' type='astring' value='child'/>
+ <propval name='ignore_error' type='astring' value='core,signal'/>
+ </property_group>
+ <instance name='default' enabled='false'>
+ <method_context working_directory='@TASKD_DATA@'>
+ <method_credential user="@TASKD_USER@" group="@TASKD_GROUP@" />
+ <method_environment>
+ <envvar name='PATH' value='@PREFIX@/bin:/opt/local/sbin:/usr/bin:/usr/sbin:/bin'/>
+ </method_environment>
+ </method_context>
+ <property_group name='config' type='application'>
+ <propval name='taskdata' type='astring' value='@TASKD_DATA@'/>
+ </property_group>
+ </instance>
+ <stability value='Evolving'/>
+ <template>
+ <common_name>
+ <loctext xml:lang='C'>The Taskserver is a server to access task data</loctext>
+ </common_name>
+ </template>
+ </service>
+</service_bundle>
diff --git a/taskd/patches/patch-src_TLSServer.cpp b/taskd/patches/patch-src_TLSServer.cpp
new file mode 100644
index 0000000000..cf8aeccae2
--- /dev/null
+++ b/taskd/patches/patch-src_TLSServer.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+errno.h is also required on NetBSD
+
+--- src/TLSServer.cpp.orig 2015-05-10 21:35:22.000000000 +0000
++++ src/TLSServer.cpp
+@@ -38,7 +38,7 @@
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+-#if (defined OPENBSD || defined SOLARIS)
++#if (defined OPENBSD || defined SOLARIS || defined NETBSD)
+ #include <errno.h>
+ #else
+ #include <sys/errno.h>
diff --git a/taskserver/DESCR b/taskserver/DESCR
deleted file mode 100644
index 23ef9c0fd0..0000000000
--- a/taskserver/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-The Taskserver is a lightweight, secure server providing multi-user,
-multi-client access to task data. This allows true syncing between
-desktop and mobile clients.
diff --git a/taskserver/MESSAGE b/taskserver/MESSAGE
deleted file mode 100644
index 5c73938fa7..0000000000
--- a/taskserver/MESSAGE
+++ /dev/null
@@ -1,14 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.0 2017/08/21 16:04:13 drscream Exp $
-
-Be sure you initialize the ${PKGNAME} server in the TASKDDATA directory:
-
- export TASKDDATA=${TASKD_DATA}
- taskd init
-
-Follow additional steps to configure the SSL certificates and keys on the
-official website:
-
-https://taskwarrior.org/docs/taskserver/configure.html
-
-===========================================================================
diff --git a/taskserver/Makefile b/taskserver/Makefile
deleted file mode 100644
index a7ab2d5c61..0000000000
--- a/taskserver/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# $NetBSD$
-
-DISTNAME= taskd-1.1.0
-PKGREVISION= 2
-CATEGORIES= net
-MASTER_SITES= http://taskwarrior.org/download/
-
-MAINTAINER= esg%sdf.org@localhost
-HOMEPAGE= http://taskwarrior.org/download/
-COMMENT= Lightweight, secure server providing access to task data
-LICENSE= mit
-
-USE_CMAKE= yes
-USE_LANGUAGES= c c++
-
-CMAKE_ARGS+= -DTASKD_MAN1DIR=${PREFIX}/${PKGMANDIR}/man1
-CMAKE_ARGS+= -DTASKD_MAN5DIR=${PREFIX}/${PKGMANDIR}/man5
-
-LDFLAGS.SunOS+= -lsocket -lnsl
-
-.include "../../mk/bsd.prefs.mk"
-SMF_NAME= taskd
-TASKD_USER?= taskd
-TASKD_GROUP?= taskd
-TASKD_DATA?= ${VARBASE}/taskd
-PKG_GROUPS= ${TASKD_GROUP}
-PKG_USERS= ${TASKD_USER}:${TASKD_GROUP}
-PKG_GROUPS_VARS= TASKD_USER
-PKG_USERS_VARS= TASKD_GROUP
-PKG_HOME.${TASKD_USER}= ${TASKD_DATA}
-
-FILES_SUBST+= TASKD_USER=${TASKD_USER} TASKD_GROUP=${TASKD_GROUP} \
- TASKD_DATA=${TASKD_DATA}
-MESSAGE_SUBST+= TASKD_DATA=${TASKD_DATA}
-
-EGDIR= ${PREFIX}/share/examples/taskd
-EGFILES+= pki/README pki/generate pki/generate.ca \
- pki/generate.client pki/generate.crl \
- pki/generate.server pki/vars
-INSTALLATION_DIRS+= ${EGDIR}/pki
-
-BUILD_DEFS+= TASKD_USER TASKD_GROUP TASKD_DATA VARBASE
-
-REPLACE_SH= src/taskdctl
-
-MAKE_DIRS=+ ${TASKD_DATA}
-OWN_DIRS_PERMS+= ${TASKD_DATA} ${TASKD_USER} ${TASKD_GROUP} 0750
-
-post-install:
-.for file in ${EGFILES}
- ${INSTALL_DATA} ${WRKSRC}/${file} ${DESTDIR}${EGDIR}/${file}
-.endfor
-
-.include "../../devel/libuuid/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/taskserver/PLIST b/taskserver/PLIST
deleted file mode 100644
index cfda7c418b..0000000000
--- a/taskserver/PLIST
+++ /dev/null
@@ -1,18 +0,0 @@
-@comment $NetBSD$
-bin/taskd
-bin/taskdctl
-man/man1/taskd.1
-man/man1/taskdctl.1
-man/man5/taskdrc.5
-share/doc/taskd/AUTHORS
-share/doc/taskd/COPYING
-share/doc/taskd/ChangeLog
-share/doc/taskd/INSTALL
-share/doc/taskd/NEWS
-share/examples/taskd/pki/README
-share/examples/taskd/pki/generate
-share/examples/taskd/pki/generate.ca
-share/examples/taskd/pki/generate.client
-share/examples/taskd/pki/generate.crl
-share/examples/taskd/pki/generate.server
-share/examples/taskd/pki/vars
diff --git a/taskserver/distinfo b/taskserver/distinfo
deleted file mode 100644
index 3662c35b6e..0000000000
--- a/taskserver/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD$
-
-SHA1 (taskd-1.1.0.tar.gz) = ded339deeee65277e4712f71a9159502f8b20b52
-RMD160 (taskd-1.1.0.tar.gz) = f5256fda0de4dc46a4f09167666e81bed3452f69
-SHA512 (taskd-1.1.0.tar.gz) = df2349c354258fd1b014b1a9c78f68dc10c9e5a48357e282e8a760cf4e4aaf4d36486796ad094ee2b050e7506195b778e3316c90ef543a2f8242de313daa13aa
-Size (taskd-1.1.0.tar.gz) = 120115 bytes
-SHA1 (patch-src_TLSServer.cpp) = 6e47c0ef59dc6c265539152b7abce75b5e518d45
diff --git a/taskserver/files/smf/manifest.xml b/taskserver/files/smf/manifest.xml
deleted file mode 100644
index b2cecb240e..0000000000
--- a/taskserver/files/smf/manifest.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
-<service_bundle type='manifest' name='export'>
- <service name='@SMF_PREFIX@/@SMF_NAME@' type='service' version='0'>
- <dependency name='net-physical' grouping='require_all' restart_on='none' type='service'>
- <service_fmri value='svc:/network/physical'/>
- </dependency>
- <dependency name='filesystem' grouping='require_all' restart_on='none' type='service'>
- <service_fmri value='svc:/system/filesystem/local'/>
- </dependency>
- <exec_method name='start' type='method' exec='@PREFIX@/bin/taskd server --data %{config/taskdata}' timeout_seconds='0'/>
- <exec_method name='stop' type='method' exec=':kill' timeout_seconds='10'/>
- <exec_method name='refresh' type='method' exec=':kill -HUP' timeout_seconds='60'/>
- <property_group name='startd' type='framework'>
- <propval name='duration' type='astring' value='child'/>
- <propval name='ignore_error' type='astring' value='core,signal'/>
- </property_group>
- <instance name='default' enabled='false'>
- <method_context working_directory='@TASKD_DATA@'>
- <method_credential user="@TASKD_USER@" group="@TASKD_GROUP@" />
- <method_environment>
- <envvar name='PATH' value='@PREFIX@/bin:/opt/local/sbin:/usr/bin:/usr/sbin:/bin'/>
- </method_environment>
- </method_context>
- <property_group name='config' type='application'>
- <propval name='taskdata' type='astring' value='@TASKD_DATA@'/>
- </property_group>
- </instance>
- <stability value='Evolving'/>
- <template>
- <common_name>
- <loctext xml:lang='C'>The Taskserver is a server to access task data</loctext>
- </common_name>
- </template>
- </service>
-</service_bundle>
diff --git a/taskserver/patches/patch-src_TLSServer.cpp b/taskserver/patches/patch-src_TLSServer.cpp
deleted file mode 100644
index cf8aeccae2..0000000000
--- a/taskserver/patches/patch-src_TLSServer.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-errno.h is also required on NetBSD
-
---- src/TLSServer.cpp.orig 2015-05-10 21:35:22.000000000 +0000
-+++ src/TLSServer.cpp
-@@ -38,7 +38,7 @@
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
--#if (defined OPENBSD || defined SOLARIS)
-+#if (defined OPENBSD || defined SOLARIS || defined NETBSD)
- #include <errno.h>
- #else
- #include <sys/errno.h>
Home |
Main Index |
Thread Index |
Old Index