diff options
| -rw-r--r-- | .config/git/config (renamed from .gitconfig) | 0 | ||||
| -rw-r--r-- | .config/pacman/makepkg.conf (renamed from .makepkg.conf) | 0 | ||||
| -rw-r--r-- | .gitignore | 7 | ||||
| -rw-r--r-- | .gnupg/.gitignore | 3 | ||||
| -rw-r--r-- | .gnupg/gpg.conf | 194 | ||||
| -rw-r--r-- | .local/bin/.gitignore | 1 | ||||
| -rw-r--r-- | .local/bin/autobuild.c (renamed from bin/autobuild.c) | 2 | ||||
| -rwxr-xr-x | .local/bin/autobuild.sh (renamed from bin/autobuild.sh) | 0 | ||||
| -rwxr-xr-x | .local/bin/setup | 50 | ||||
| -rw-r--r-- | .ssh/.gitignore | 1 | ||||
| -rw-r--r-- | .ssh/config | 3 | ||||
| -rw-r--r-- | .ssh/known_hosts | 4 | ||||
| -rwxr-xr-x | bin/setup | 41 |
13 files changed, 58 insertions, 248 deletions
diff --git a/.gitconfig b/.config/git/config index 15afca0..15afca0 100644 --- a/.gitconfig +++ b/.config/git/config diff --git a/.makepkg.conf b/.config/pacman/makepkg.conf index caad51b..caad51b 100644 --- a/.makepkg.conf +++ b/.config/pacman/makepkg.conf @@ -1,9 +1,2 @@ -/bin/autobuild /packages/ - -/.ssh/id_* - -/.gnupg/* -!/.gnupg/gpg.conf - *~ diff --git a/.gnupg/.gitignore b/.gnupg/.gitignore new file mode 100644 index 0000000..4f91c30 --- /dev/null +++ b/.gnupg/.gitignore @@ -0,0 +1,3 @@ +* +!/.gitignore +!/gpg.conf diff --git a/.gnupg/gpg.conf b/.gnupg/gpg.conf index 942678f..25c6df7 100644 --- a/.gnupg/gpg.conf +++ b/.gnupg/gpg.conf @@ -1,196 +1,2 @@ -# Options for GnuPG -# Copyright 1998, 1999, 2000, 2001, 2002, 2003, -# 2010 Free Software Foundation, Inc. -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This file is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# Unless you specify which option file to use (with the command line -# option "--options filename"), GnuPG uses the file ~/.gnupg/gpg.conf -# by default. -# -# An options file can contain any long options which are available in -# GnuPG. If the first non white space character of a line is a '#', -# this line is ignored. Empty lines are also ignored. -# -# See the man page for a list of options. - -# Uncomment the following option to get rid of the copyright notice - -#no-greeting - -# If you have more than 1 secret key in your keyring, you may want to -# uncomment the following option and set your preferred keyid. - -#default-key 621CC013 - -# If you do not pass a recipient to gpg, it will ask for one. Using -# this option you can encrypt to a default key. Key validation will -# not be done in this case. The second form uses the default key as -# default recipient. - -#default-recipient some-user-id -#default-recipient-self - -# By default GnuPG creates version 4 signatures for data files as -# specified by OpenPGP. Some earlier (PGP 6, PGP 7) versions of PGP -# require the older version 3 signatures. Setting this option forces -# GnuPG to create version 3 signatures. - -#force-v3-sigs - -# Because some mailers change lines starting with "From " to ">From " -# it is good to handle such lines in a special way when creating -# cleartext signatures; all other PGP versions do it this way too. -# To enable full OpenPGP compliance you may want to use this option. - -#no-escape-from-lines - -# When verifying a signature made from a subkey, ensure that the cross -# certification "back signature" on the subkey is present and valid. -# This protects against a subtle attack against subkeys that can sign. -# Defaults to --no-require-cross-certification. However for new -# installations it should be enabled. - require-cross-certification - - -# If you do not use the Latin-1 (ISO-8859-1) charset, you should tell -# GnuPG which is the native character set. Please check the man page -# for supported character sets. This character set is only used for -# metadata and not for the actual message which does not undergo any -# translation. Note that future version of GnuPG will change to UTF-8 -# as default character set. - -#charset utf-8 - -# Group names may be defined like this: -# group mynames = paige 0x12345678 joe patti -# -# Any time "mynames" is a recipient (-r or --recipient), it will be -# expanded to the names "paige", "joe", and "patti", and the key ID -# "0x12345678". Note there is only one level of expansion - you -# cannot make an group that points to another group. Note also that -# if there are spaces in the recipient name, this will appear as two -# recipients. In these cases it is better to use the key ID. - -#group mynames = paige 0x12345678 joe patti - -# Some old Windows platforms require 8.3 filenames. If your system -# can handle long filenames, uncomment this. - -#no-mangle-dos-filenames - -# Lock the file only once for the lifetime of a process. If you do -# not define this, the lock will be obtained and released every time -# it is needed - normally this is not needed. - -#lock-once - -# GnuPG can send and receive keys to and from a keyserver. These -# servers can be HKP, email, or LDAP (if GnuPG is built with LDAP -# support). -# -# Example HKP keyservers: -# hkp://keys.gnupg.net -# -# Example LDAP keyservers: -# ldap://pgp.surfnet.nl:11370 -# -# Regular URL syntax applies, and you can set an alternate port -# through the usual method: -# hkp://keyserver.example.net:22742 -# -# If you have problems connecting to a HKP server through a buggy http -# proxy, you can use keyserver option broken-http-proxy (see below), -# but first you should make sure that you have read the man page -# regarding proxies (keyserver option honor-http-proxy) -# -# Most users just set the name and type of their preferred keyserver. -# Note that most servers (with the notable exception of -# ldap://keyserver.pgp.com) synchronize changes with each other. Note -# also that a single server name may actually point to multiple -# servers via DNS round-robin. hkp://keys.gnupg.net is an example of -# such a "server", which spreads the load over a number of physical -# servers. To see the IP address of the server actually used, you may use -# the "--keyserver-options debug". - keyserver hkp://keys.gnupg.net -#keyserver http://http-keys.gnupg.net -#keyserver mailto:pgp-public-keys@keys.nl.pgp.net - -# Common options for keyserver functions: -# -# include-disabled = when searching, include keys marked as "disabled" -# on the keyserver (not all keyservers support this). -# -# no-include-revoked = when searching, do not include keys marked as -# "revoked" on the keyserver. -# -# verbose = show more information as the keys are fetched. -# Can be used more than once to increase the amount -# of information shown. -# -# use-temp-files = use temporary files instead of a pipe to talk to the -# keyserver. Some platforms (Win32 for one) always -# have this on. -# -# keep-temp-files = do not delete temporary files after using them -# (really only useful for debugging) -# -# honor-http-proxy = if the keyserver uses HTTP, honor the http_proxy -# environment variable -# -# broken-http-proxy = try to work around a buggy HTTP proxy -# -# auto-key-retrieve = automatically fetch keys as needed from the keyserver -# when verifying signatures or when importing keys that -# have been revoked by a revocation key that is not -# present on the keyring. -# -# no-include-attributes = do not include attribute IDs (aka "photo IDs") -# when sending keys to the keyserver. - -#keyserver-options auto-key-retrieve - -# Uncomment this line to display photo user IDs in key listings and -# when a signature from a key with a photo is verified. - -#show-photos - -# Use this program to display photo user IDs -# -# %i is expanded to a temporary file that contains the photo. -# %I is the same as %i, but the file isn't deleted afterwards by GnuPG. -# %k is expanded to the key ID of the key. -# %K is expanded to the long OpenPGP key ID of the key. -# %t is expanded to the extension of the image (e.g. "jpg"). -# %T is expanded to the MIME type of the image (e.g. "image/jpeg"). -# %f is expanded to the fingerprint of the key. -# %% is %, of course. -# -# If %i or %I are not present, then the photo is supplied to the -# viewer on standard input. If your platform supports it, standard -# input is the best way to do this as it avoids the time and effort in -# generating and then cleaning up a secure temp file. -# -# The default program is "xloadimage -fork -quiet -title 'KeyID 0x%k' stdin" -# On Mac OS X and Windows, the default is to use your regular JPEG image -# viewer. -# -# Some other viewers: -# photo-viewer "qiv %i" -# photo-viewer "ee %i" -# photo-viewer "display -title 'KeyID 0x%k'" -# -# This one saves a copy of the photo ID in your home directory: -# photo-viewer "cat > ~/photoid-for-key-%k.%t" -# -# Use your MIME handler to view photos: -# photo-viewer "metamail -q -d -b -c %T -s 'KeyID 0x%k' -f GnuPG" - diff --git a/.local/bin/.gitignore b/.local/bin/.gitignore new file mode 100644 index 0000000..8eb1c0a --- /dev/null +++ b/.local/bin/.gitignore @@ -0,0 +1 @@ +/autobuild diff --git a/bin/autobuild.c b/.local/bin/autobuild.c index bb0de00..3805e19 100644 --- a/bin/autobuild.c +++ b/.local/bin/autobuild.c @@ -63,7 +63,7 @@ main(int argc, char **argv) mysetenv("LC_NUMERIC" , env_lc_numeric ); mysetenv("LC_TIME" , env_lc_time ); - const char *script_suffix = "/bin/autobuild.sh"; + const char *script_suffix = "/.local/bin/autobuild.sh"; char *script = alloca(strlen(user->pw_dir)+strlen(script_suffix)); strcpy(script, user->pw_dir); strcpy(&(script[strlen(user->pw_dir)]), script_suffix); diff --git a/bin/autobuild.sh b/.local/bin/autobuild.sh index d62e77b..d62e77b 100755 --- a/bin/autobuild.sh +++ b/.local/bin/autobuild.sh diff --git a/.local/bin/setup b/.local/bin/setup new file mode 100755 index 0000000..e26c590 --- /dev/null +++ b/.local/bin/setup @@ -0,0 +1,50 @@ +#!/usr/bin/make -f + +HOME = $(shell cd "$(dir $(lastword $(MAKEFILE_LIST)))" && git rev-parse --show-toplevel) +export HOME +undefine XDG_CONFIG_DIR + +LANG = C +export LANG +undefine $(filter LC_%,$(.VARIABLES)) + +CFLAGS += -std=c99 -Wall -Wextra -Werror -Wno-unused-parameter + +dirs = \ + $(HOME)/packages/pkgdest \ + $(HOME)/packages/srcdest \ + $(HOME)/packages/srcpkgdest \ + $(HOME)/packages/logdest \ + $(HOME)/packages/builddir + +all: \ + $(HOME)/.local/bin/autobuild \ + $(HOME)/.ssh/id_rsa \ + $(HOME)/.ssh/id_rsa.pub \ + $(HOME)/.gnupg/secring.gpg \ + $(HOME)/packages/abslibre \ + $(dirs) + +$(HOME)/.local/bin/autobuild: %: %.c + cd $(@D) && $(LINK.c) $(notdir $^) $(LOADLIBES) $(LDLIBS) -o $(@F) && chmod 6755 $(@F) + +$(HOME)/.ssh/id_% $(HOME)/.ssh/id_%.pub: + ssh-keygen -N '' -f $(@D)/id_$* + +$(HOME)/.gnupg/secring.gpg: | $(HOME)/.config/git/config + chmod 700 $(@D) + printf '%s\n' \ + 'Key-Type: default' \ + 'Subkey-Type: default' \ + "Name-Real: $$(git config user.name)" \ + "Name-Email: $$(git config user.email)" \ + 'Expire-Date: 0' \ + | gpg --gen-key --batch + +$(HOME)/packages/abslibre: + createworkdir + +$(dirs): %: + mkdir -p -- $@ + +.DELETE_ON_ERROR: diff --git a/.ssh/.gitignore b/.ssh/.gitignore new file mode 100644 index 0000000..382ea75 --- /dev/null +++ b/.ssh/.gitignore @@ -0,0 +1 @@ +/id_* diff --git a/.ssh/config b/.ssh/config index 1a90be7..bb876ba 100644 --- a/.ssh/config +++ b/.ssh/config @@ -1,6 +1,3 @@ Host * Protocol 2 Compression yes -Host repo - Port 1863 - HostName repo.parabolagnulinux.org diff --git a/.ssh/known_hosts b/.ssh/known_hosts index 927ab67..927bb7f 100644 --- a/.ssh/known_hosts +++ b/.ssh/known_hosts @@ -1,2 +1,2 @@ -localhost,projects.parabolagnulinux.org,142.4.205.9,[projects.parabolagnulinux.org]:1863,[142.4.205.9]:1863 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHkqv9ewWyXjrO6P5iYiUYfEYP8ALBg9C2GxA7yOJDa/vwDtx6OS3KMNRkUgx6vL/6/D555Xdypys+lwLmcdmnM= -[repo.parabolagnulinux.org]:1863,[80.87.131.252]:1863 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK4pzgrqj2qrklFpDZrg56bjVHJyodEtvdU/QUQNPgErfjfn0BJRi4N2zL19VK5ab3kJ6zJrfY7YWOv/Ky+MqUw= +git.parabola.nu,93.95.226.249 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJpLBQvc8gXo5ZtOUSTM9B604xiYs7pC/80BBCWrrolvFS46PPuvM/zIb/7Iwv/xOsI/PDdJIrkMoqGlPuGj3Mo= +repo.parabola.nu,80.87.131.232 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMADiqJyJfjxXv+8FC3JxSfGBFmhevhHTWJEoe1gc5TVEOuvPD8XXy2o5EN9IzBLLFGlZbAEKYdt3apAFPJtwfE= diff --git a/bin/setup b/bin/setup deleted file mode 100755 index f421cbd..0000000 --- a/bin/setup +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/make -f - -CFLAGS += -std=c99 -Wall -Wextra -Werror -Wno-unused-parameter - -dirs = \ - $(HOME)/packages/pkgdest \ - $(HOME)/packages/srcdest \ - $(HOME)/packages/srcpkgdest \ - $(HOME)/packages/logdest \ - $(HOME)/packages/builddir - -all: \ - $(HOME)/bin/autobuild \ - $(HOME)/.ssh/id_rsa \ - $(HOME)/.ssh/id_rsa.pub \ - $(HOME)/.gnupg/secring.gpg \ - $(HOME)/packages/abslibre \ - $(dirs) - -autobuild $(HOME)/bin/autobuild: $(HOME)/bin/autobuild.c - $(LINK.c) $^ $(LOADLIBES) $(LDLIBS) -o $@ && chmod 6755 $@ - -$(HOME)/.ssh/id_rsa $(HOME)/.ssh/id_rsa.pub: - ssh-keygen -N '' -f $@ - -$(HOME)/.gnupg/secring.gpg: | $(HOME)/.gitconfig - printf '%s\n' \ - 'Key-Type: default' \ - 'Subkey-Type: default' \ - "Name-Real: $(git config user.name)" \ - "Name-Email: $(git config user.email)" \ - 'Expire-Date: 0' \ - | gpg --gen-key --batch - -$(HOME)/packages/abslibre: - createworkdir - -$(dirs): %: - mkdir -p -- $@ - -.DELETE_ON_ERROR: |