dot

packages and services management
Log | Files | Refs | README

commit f7c77a714063d2039c6efbc89e777a6b3053dc30
parent 06c4b369076010da79bd57d9f5a0e0cef878eebb
Author: Josuah Demangeon <mail@josuah.net>
Date:   Sun, 19 Aug 2018 18:11:52 +0200

add recipes and s6-rc changes

Diffstat:
Dbin/pack-add | 2--
Rpack/bin/pack-add -> bin/pack-add | 0
Dbin/pack-build | 2--
Rpack/bin/pack-build -> bin/pack-build | 0
Dbin/pack-chroot | 2--
Rpack/bin/pack-chroot -> bin/pack-chroot | 0
Dbin/pack-cvs | 2--
Rpack/bin/pack-cvs -> bin/pack-cvs | 0
Dbin/pack-del | 2--
Rpack/bin/pack-del -> bin/pack-del | 0
Dbin/pack-get | 2--
Rpack/bin/pack-get -> bin/pack-get | 0
Dbin/pack-git | 2--
Rpack/bin/pack-git -> bin/pack-git | 0
Dbin/pack-tar | 2--
Rpack/bin/pack-tar -> bin/pack-tar | 0
Dbin/pack-up | 2--
Rpack/bin/pack-up -> bin/pack-up | 0
Dbin/s6-rc-stop | 3---
Mbin/suckless-patch-mail | 11++++-------
Dbin/woman | 3---
Mconfigure | 4+---
Rdata/todo.txt -> data/todo | 0
Ddot/bash_profile | 2--
Ddot/bashrc | 2--
Mdot/msmtprc | 2+-
Rnode/t470s/pack -> host/t470s/pack | 0
Ahost/t470s/source/httpd-log | 2++
Ahost/t470s/source/httpd-run | 2++
Ahost/t470s/source/tinysshd-log | 2++
Ahost/t470s/source/tinysshd-run | 2++
Minit | 2+-
Dnode/t470s/source/httpd-log | 2--
Dnode/t470s/source/httpd-run | 2--
Dnode/t470s/source/tinysshd-log | 2--
Dnode/t470s/source/tinysshd-run | 2--
Apack/farbfeld/git/build | 5+++++
Apack/farbfeld/git/c.mk | 22++++++++++++++++++++++
Apack/farbfeld/git/config.mk | 22++++++++++++++++++++++
Apack/farbfeld/git/dep | 3+++
Apack/farbfeld/git/git | 1+
Mpack/msmtp/1.6.5/build | 7++++++-
Dsetup | 3---
43 files changed, 74 insertions(+), 52 deletions(-)

diff --git a/bin/pack-add b/bin/pack-add @@ -1 +0,0 @@ -../pack/bin/pack-add- \ No newline at end of file diff --git a/pack/bin/pack-add b/bin/pack-add diff --git a/bin/pack-build b/bin/pack-build @@ -1 +0,0 @@ -../pack/bin/pack-build- \ No newline at end of file diff --git a/pack/bin/pack-build b/bin/pack-build diff --git a/bin/pack-chroot b/bin/pack-chroot @@ -1 +0,0 @@ -../pack/bin/pack-chroot- \ No newline at end of file diff --git a/pack/bin/pack-chroot b/bin/pack-chroot diff --git a/bin/pack-cvs b/bin/pack-cvs @@ -1 +0,0 @@ -../pack/bin/pack-cvs- \ No newline at end of file diff --git a/pack/bin/pack-cvs b/bin/pack-cvs diff --git a/bin/pack-del b/bin/pack-del @@ -1 +0,0 @@ -../pack/bin/pack-del- \ No newline at end of file diff --git a/pack/bin/pack-del b/bin/pack-del diff --git a/bin/pack-get b/bin/pack-get @@ -1 +0,0 @@ -../pack/bin/pack-get- \ No newline at end of file diff --git a/pack/bin/pack-get b/bin/pack-get diff --git a/bin/pack-git b/bin/pack-git @@ -1 +0,0 @@ -../pack/bin/pack-git- \ No newline at end of file diff --git a/pack/bin/pack-git b/bin/pack-git diff --git a/bin/pack-tar b/bin/pack-tar @@ -1 +0,0 @@ -../pack/bin/pack-tar- \ No newline at end of file diff --git a/pack/bin/pack-tar b/bin/pack-tar diff --git a/bin/pack-up b/bin/pack-up @@ -1 +0,0 @@ -../pack/bin/pack-up- \ No newline at end of file diff --git a/pack/bin/pack-up b/bin/pack-up diff --git a/bin/s6-rc-stop b/bin/s6-rc-stop @@ -1,3 +0,0 @@ -#!/usr/bin/env execlineb - -s6-svscanctl -t /run/s6 diff --git a/bin/suckless-patch-mail b/bin/suckless-patch-mail @@ -1,8 +1,5 @@ -#!/9/bin/rc -e +#!/bin/sh -e -back=1 -if (! ~ $#* 0) back=$1 - -git send-email --to hackers@suckless.org -$back \ - --subject-prefix `{basename `{pwd}}^'][PATCH' \ - --smtp-server `{whatis msmtp} +git send-email --to hackers@suckless.org -"${1:-1}" \ + --subject-prefix "$(basename "$PWD")][PATCH" \ + --smtp-server "$(whatis msmtp)" diff --git a/bin/woman b/bin/woman @@ -1,3 +0,0 @@ -#!/9/bin/rc -e - -man -T ascii $* | col -b diff --git a/configure b/configure @@ -10,7 +10,5 @@ test "$(whoami)" = root || exit 0 cd .. ln -sf "$PWD/s6-rc" "$PWD/pack" /etc -rm -rf /etc/node -ln -sf "$PWD/node/$(uname -n)" /etc/node mkdir -p /var/s6-rc -ln -sf /etc/node/source /var/s6-rc +ln -sf "host/$(uname -n)/source" /var/s6-rc diff --git a/data/todo.txt b/data/todo diff --git a/dot/bash_profile b/dot/bash_profile @@ -1 +0,0 @@ -.profile- \ No newline at end of file diff --git a/dot/bashrc b/dot/bashrc @@ -1 +0,0 @@ -.profile- \ No newline at end of file diff --git a/dot/msmtprc b/dot/msmtprc @@ -7,7 +7,7 @@ host kley.josuah.net from mail@josuah.net #user mail@josuah.net auth off -#passwordeval "echo" +passwordeval "pass get mail.josuah.net" logfile /dev/stderr account default : mail@josuah.net diff --git a/node/t470s/pack b/host/t470s/pack diff --git a/host/t470s/source/httpd-log b/host/t470s/source/httpd-log @@ -0,0 +1 @@ +/etc/s6-rc/httpd-log+ \ No newline at end of file diff --git a/host/t470s/source/httpd-run b/host/t470s/source/httpd-run @@ -0,0 +1 @@ +/etc/s6-rc/httpd-run+ \ No newline at end of file diff --git a/host/t470s/source/tinysshd-log b/host/t470s/source/tinysshd-log @@ -0,0 +1 @@ +/etc/s6-rc/tinysshd-log/+ \ No newline at end of file diff --git a/host/t470s/source/tinysshd-run b/host/t470s/source/tinysshd-run @@ -0,0 +1 @@ +/etc/s6-rc/tinysshd-run+ \ No newline at end of file diff --git a/init b/init @@ -3,7 +3,7 @@ # setup if { s6-rmrf /run/s6 } if { s6-mkdir -p /run/s6 } -if { s6-hier-copy -nfs /etc/s6-rc/s6-svscan-log /run/s6/s6-svscan-log } +if { s6-hiercopy /etc/s6-rc/s6-svscan-log /run/s6/s6-svscan-log } # s6-svscan background diff --git a/node/t470s/source/httpd-log b/node/t470s/source/httpd-log @@ -1 +0,0 @@ -/etc/s6-rc/httpd-log- \ No newline at end of file diff --git a/node/t470s/source/httpd-run b/node/t470s/source/httpd-run @@ -1 +0,0 @@ -/etc/s6-rc/httpd-run- \ No newline at end of file diff --git a/node/t470s/source/tinysshd-log b/node/t470s/source/tinysshd-log @@ -1 +0,0 @@ -/etc/s6-rc/tinysshd-log/- \ No newline at end of file diff --git a/node/t470s/source/tinysshd-run b/node/t470s/source/tinysshd-run @@ -1 +0,0 @@ -/etc/s6-rc/tinysshd-run- \ No newline at end of file diff --git a/pack/farbfeld/git/build b/pack/farbfeld/git/build @@ -0,0 +1,5 @@ +#!/bin/sh -ex + +cp "$PACK/config.mk" config.mk + +make PREFIX="$PREFIX" install diff --git a/pack/farbfeld/git/c.mk b/pack/farbfeld/git/c.mk @@ -0,0 +1,22 @@ +# farbfeld version +VERSION = 3 + +# Customize below to fit your system + +# paths +PREFIX = /local +MANPREFIX = ${PREFIX}/share/man + +# flags +CPPFLAGS = -D_DEFAULT_SOURCE +CFLAGS = -std=c99 -pedantic -Wall -Wextra -Os \ + -I/opt/libpng/cur/include \ + -I/opt/libjpeg/cur/include +LDFLAGS = -s \ + -L/opt/libjpeg/cur/lib \ + -L/opt/libpng/cur/lib +PNG_LDFLAGS = -lpng +JPG_LDFLAGS = -ljpeg + +# compiler and linker +CC = cc diff --git a/pack/farbfeld/git/config.mk b/pack/farbfeld/git/config.mk @@ -0,0 +1,22 @@ +# farbfeld version +VERSION = 3 + +# Customize below to fit your system + +# paths +PREFIX = /local +MANPREFIX = ${PREFIX}/share/man + +# flags +CPPFLAGS = -D_DEFAULT_SOURCE +CFLAGS = -std=c99 -pedantic -Wall -Wextra -Os \ + -I/opt/libpng/cur/include \ + -I/opt/libjpeg/cur/include +LDFLAGS = -s \ + -L/opt/libjpeg/cur/lib \ + -L/opt/libpng/cur/lib +PNG-LDLIBS = -lpng +JPG-LDLIBS = -ljpeg + +# compiler and linker +CC = cc diff --git a/pack/farbfeld/git/dep b/pack/farbfeld/git/dep @@ -0,0 +1,3 @@ +gmake/cur +libpng/cur +libjpeg/cur diff --git a/pack/farbfeld/git/git b/pack/farbfeld/git/git @@ -0,0 +1 @@ +git://git.suckless.org/farbfeld diff --git a/pack/msmtp/1.6.5/build b/pack/msmtp/1.6.5/build @@ -2,7 +2,12 @@ export libssl_CFLAGS="-I'/opt/libressl/cur/include'" export libssl_LIBS="-L'/opt/libressl/cur/lib' -lssl -lcrypto" +export PKG_CONFIG=/bin/true -./configure --prefix="$PREFIX" --with-tls=openssl +./configure --prefix="$PREFIX" \ + --with-tls=openssl \ + --without-libsecret \ + --without-libidn \ + --without-libgsasl make install diff --git a/setup b/setup @@ -1,3 +0,0 @@ -#!/bin/sh -e - -xargs -r -n1 pack-add </etc/node/pack