X-Git-Url: https://pd.if.org/git/?p=zpackage;a=blobdiff_plain;f=Makefile;h=9800cfe83fd13178e1f7058a5db4aa01e2bd150c;hp=938d33678163b9644b6bc1000cdb92d007e76c0d;hb=72b60d5f77676b6b500d58bae81a27923fa1bee7;hpb=92da0e851083ec948b2c86f368c6ddeae2dec5f6 diff --git a/Makefile b/Makefile index 938d336..9800cfe 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,16 @@ CC=clang --target=x86_64-pc-linux-musl CC=/usr/musl/bin/musl-clang +LD=lld #CC=/usr/musl/bin/musl-gcc #CFLAGS=-Wall -W -Wextra -Werror -Wno-implicit-fallthrough -std=c99 -Ilib -Isqlite -Ielf -I. -Ilzma/api --target=x86_64-pc-linux-musl -CFLAGS=-Wall -W -Wextra -Werror -Wno-implicit-fallthrough -std=c99 -Ilib -Isqlite -Ielf -I. -Ilzma/api +CFLAGS=-Wall -W -Wextra -Werror -Wno-implicit-fallthrough -std=c99 -Ilib -Isqlite -Ielf -I. -Ilzma/api -Wno-unused-command-line-argument ZPMVER:=$(shell git describe --tags --match 'v[0-9]*' | sed -e 's/^v//' | sed -e 's/-g.\+//' | sed -e 's/-/./g') LZMAFLAGS=-Ilzma/api -Ilzma/tuklib -Ilzma/lzma -Ilzma/common -Ilzma/check -Ilzma/lz -Ilzma/rangecoder -Ilzma/simple -Ilzma/delta -DHAVE_CHECK_CRC64 -DHAVE_CHECK_CRC32 -DHAVE_ENCODER_LZMA2 -DHAVE_DECODER_LZMA2 -DHAVE_MF_BT4 -LDFLAGS=-fuse-ld=lld -L. -static +#LDFLAGS=-fuse-ld=lld -L. -static +LDFLAGS=-fuse-ld=/usr/musl/bin/ld.musl-clang -L. -static LZMACHECKSRC=lzma/check/check.c lzma/check/crc32_fast.c lzma/check/crc64_fast.c lzma/check/crc32_table.c lzma/check/crc64_table.c LZMASRC=$(shell ls lzma/lzma/*.c lzma/common/*.c lzma/lz/*.c) $(LZMACHECKSRC) lzma/rangecoder/price_table.c @@ -22,29 +24,32 @@ lib/jsw/jsw_rbtree.c JSWOBJ=$(JSWSRC:%.c=%.o) LIBZPMSRC=sha256.c db.c compress.c uncompress.c zpm.c zpm_hash.c \ foreach_path.c vercmp.c findpkg.c quote.c dbquery.c script_hash.c \ - parse.c integ.c seterror.c notes.c createpkg.c + parse.c integ.c seterror.c notes.c createpkg.c buffer.c \ + blake2b.c LIBZPMOBJ=$(addprefix lib/, $(LIBZPMSRC:%.c=%.o)) curdir=$(shell pwd) -ZPKGBIN=zpm-addfile zpm-extract zpm-init zpm-vercmp zpm-stat zpm-hash \ +COMPILED=zpm-addfile zpm-extract zpm-init zpm-vercmp zpm-stat zpm-hash \ zpm-findpkg zpm-shell zpm-soneed zpm-foreach-path zpm-parse \ zpm-script zpm-soname zpm-syncfs zpm-packagehash zpm-verify \ zpm-elftype zpm-quote zpm-note zpm-search zpm-add zpm-fetchurl \ zpm-sign +BINARIES=$(addprefix bin/, $(COMPILED)) + SCRIPTS=zpm zpm-install zpm-merge zpm-list zpm-test zpm-log \ zpm-contents zpm-uninstall zpm-pathmod zpm-rmpackage zpm-newpackage \ - zpm-pkg zpm-pkgfile zpm-gc zpm-repo zpm-update zpm-confgit + zpm-pkg zpm-pkgfile zpm-gc zpm-repo zpm-update zpm-confgit \ + zpm-pkgdeps MANPAGES=$(shell ls doc/*.8) #MANPAGES=doc/zpm.8 $(addprefix doc/zpm-, list.8 contents.8 hash.8 quote.8 pathmod.8 note.8 vercmp.8 repo.8 gc.8) -COMPILED=$(ZPKGBIN) -PROGRAMS=$(SCRIPTS) $(COMPILED) +PROGRAMS=$(addprefix bin/, $(SCRIPTS)) $(BINARIES) def: programs - strip $(ZPKGBIN) + strip $(BINARIES) d: printf '%s\n' $(LZMAOBJ) @@ -98,80 +103,87 @@ lzma.o: lzma.c gcc -std=c99 -Wall -c -o $@ $< stest: $(ZPKGBIN) - PATH=$(curdir)/t:$(curdir):$(PATH) t/$(T).t + PATH=$(curdir)/t:$(curdir)/bin:$(PATH) t/$(T).t t/ctap/prove: t/ctap/prove.o $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ test: $(ZPKGBIN) t/ctap/prove - @PATH=$(curdir)/t:$(curdir):$(PATH) t/ctap/prove t/*.t + @PATH=$(curdir)/t:$(curdir)/bin:$(PATH) t/ctap/prove t/*.t -programs: $(ZPKGBIN) +programs: $(PROGRAMS) uncompress: uncompress.o $(CC) $(CFLAGS) -o $@ $+ -llzma -zpm-elftype: elf/elftype.o +bin/zpm-elftype: elf/elftype.o $(CC) $(CFLAGS) -Ielf $(LDFLAGS) -o $@ $+ -zpm-soname: elf/soname.o +bin/zpm-soname: elf/soname.o $(CC) $(CFLAGS) -Ielf $(LDFLAGS) -o $@ $+ -zpm-soneed: elf/needed.o +bin/zpm-soneed: elf/needed.o $(CC) $(CFLAGS) -Ielf $(LDFLAGS) -o $@ $+ -zpm-addfile: src/addfile.o libzpm.a libelf.a +bin/zpm-addfile: src/addfile.o libzpm.a libelf.a $(CC) -Ielf $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -zpm-hash: src/hash.o libzpm.a +lib/sha256.o: CFLAGS+=-O3 +lib/blake2/ref/blake2b-ref.o: CFLAGS+=-O3 + +zpm-hash: libzpm.a +bin/zpm-hash: src/hash.o lib/sha256.o $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -zpm-verify: src/verify.o t/ctap/ctap.o libzpm.a +bin/zpm-blake2: src/blake2.o lib/sha256.o lib/blake2/ref/blake2b-ref.o + $(CC) -O3 $(CFLAGS) $(LDFLAGS) -o $@ $+ + +bin/zpm-verify: src/verify.o t/ctap/ctap.o libzpm.a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< t/ctap/ctap.o -lzpm -lelf -zpm-init: src/init.o libzpm.a +bin/zpm-init: src/init.o libzpm.a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -zpm-stat: src/stat.o +bin/zpm-stat: src/stat.o $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -zpm-extract: src/extract.o libzpm.a +bin/zpm-extract: src/extract.o libzpm.a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -zpm-script: src/script.o libzpm.a +bin/zpm-script: src/script.o libzpm.a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -zpm-packagehash: src/packagehash.o libzpm.a +bin/zpm-packagehash: src/packagehash.o libzpm.a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf src/foreach-path.o: CFLAGS+=-Wno-unused-parameter src/script.o: CFLAGS+=-Wno-unused-parameter -zpm-foreach-path: src/foreach-path.o libzpm.a sqlite/sqlite3.h +bin/zpm-foreach-path: src/foreach-path.o libzpm.a sqlite/sqlite3.h $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -zpm-findpkg: src/findpkg.o libzpm.a +bin/zpm-findpkg: src/findpkg.o libzpm.a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -zpm-search: src/search.o libzpm.a +bin/zpm-search: src/search.o libzpm.a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -zpm-note: src/note.o libzpm.a +bin/zpm-note: src/note.o libzpm.a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -zpm-syncfs: src/syncfs.o libzpm.a libelf.a +bin/zpm-syncfs: src/syncfs.o libzpm.a libelf.a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -lm -zpm-parse: src/parse.o lib/parse.o +bin/zpm-parse: src/parse.o lib/parse.o $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ -zpm-add: src/add.o libzpm.a libelf.a +bin/zpm-add: src/add.o libzpm.a libelf.a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -zpm-quote: src/quote.o +bin/zpm-quote: src/quote.o $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -db.sql: schema/main.sql schema/syncconflicts.sql schema/syncinfo.sql schema/preserve_packages.sql schema/age.sql +db.sql: schema/main.sql schema/syncconflicts.sql schema/syncinfo.sql schema/preserve_packages.sql schema/age.sql schema/sign.sql echo 'begin;' > $@ cat $+ >> $@ echo 'commit;' >> $@ @@ -182,23 +194,23 @@ newdb.c: db.sql echo ", 0};" >> $@ sqlite/sqlite3.o: sqlite/sqlite3.c sqlite/config.h - $(CC) -Wall -std=c99 -Ilib -D_HAVE_SQLITE_CONFIG_H=1 -c -o $@ $< + $(CC) -Wall -Wno-unused-command-line-argument -std=c99 -Ilib -D_HAVE_SQLITE_CONFIG_H=1 -c -o $@ $< sqlite/extensions.o: sqlite/extensions.c $(CC) -O3 -Wall -std=c99 -I. -Isqlite -DSQLITE_CORE=1 -c -o $@ $< sqlite/shell.o: sqlite/shell.c sqlite/config.h Makefile - $(CC) -Wall -std=c99 -Ilib \ + $(CC) -Wall -Wno-unused-command-line-argument -std=c99 -Ilib \ -DSQLITE_OMIT_LOAD_EXTENSION=1 \ '-DSQLITE_SHELL_INIT_PROC(x)=zpm_setup_extensions(x)' \ -D_POSIX_C_SOURCE=200112L -c -o $@ $< lib/zpm.o: newdb.c -zpm-vercmp: src/vercmp.o lib/vercmp.o +bin/zpm-vercmp: src/vercmp.o lib/vercmp.o lib/parse.o $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ -zpm-shell: sqlite/sqlite3.o sqlite/shell.o sqlite/extensions.o lib/vercmp.o +bin/zpm-shell: sqlite/sqlite3.o sqlite/shell.o sqlite/extensions.o lib/vercmp.o lib/parse.o $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ libelf.a: elf/libelf.o @@ -206,6 +218,8 @@ libelf.a: elf/libelf.o install: $(COMPILED) $(MANPAGES) test -d $(DESTDIR)/sbin || install -d $(DESTDIR)/sbin + test -d $(DESTDIR)/var/lib/zpm || install -d $(DESTDIR)/var/lib/zpm + test -d $(DESTDIR)/var/lib/zpm/packages || install -d $(DESTDIR)/var/lib/zpm/packages install $(PROGRAMS) $(DESTDIR)/sbin mkdir -p $(DESTDIR)/usr/share/man/man8 install -m644 $(MANPAGES) $(DESTDIR)/usr/share/man/man8 @@ -238,7 +252,7 @@ crypto/x25519.o: $(addprefix crypto/ref10/, $(X255OBJ)) ld -o $@ -r $+ crypto/%.o: CFLAGS+=-Icrypto -DTFM_DESC -DTFM_NO_ASM \ - -Itomsfastmath/src/headers -static \ + -Itomsfastmath/src/headers \ -Wno-pointer-sign -Wno-missing-braces -Ilibtomcrypt/src/headers # -DDEBUG @@ -247,7 +261,7 @@ crypto/%.o: CFLAGS+=-Icrypto -DTFM_DESC -DTFM_NO_ASM \ #/usr/musl/bin/musl-clang -Wall -Wextra -Wno-missing-braces -Werror -Wno-pointer-sign -I. -DTFM_DESC -DTFM_NO_ASM -I ../libtomcrypt/src/headers -I ../tomsfastmath/src/headers -DSTRICT_TLS -DIGNORE_SESSION_ID --rtlib=compiler-rt -c -o tlse.o tlse.c -tls.o: $(addprefix crypto/, $(TLSOBJ)) +crypto/tls.o: $(addprefix crypto/, $(TLSOBJ)) ld -o $@ -r $+ TFMOBJ= \ @@ -342,6 +356,7 @@ TFMOBJ= \ sqr/fp_sqrmod.o tomsfastmath/src/addsub/%.o: CFLAGS+=-DTFM_DESC -DTFM_NO_ASM -Itomsfastmath/src/headers -DARGTYPE=4 + tomsfastmath/src/%.o: CFLAGS+=-DTFM_DESC -DTFM_NO_ASM -Itomsfastmath/src/headers -DARGTYPE=4 tfm.o: $(addprefix tomsfastmath/src/, $(TFMOBJ)) @@ -349,24 +364,9 @@ tfm.o: $(addprefix tomsfastmath/src/, $(TFMOBJ)) LTCOBJ= \ ciphers/aes/aes.o \ - ciphers/anubis.o \ - ciphers/blowfish.o \ - ciphers/camellia.o \ - ciphers/cast5.o \ - ciphers/des.o \ - ciphers/kasumi.o \ - ciphers/khazad.o \ - ciphers/kseed.o \ - ciphers/multi2.o \ - ciphers/noekeon.o \ - ciphers/rc2.o \ ciphers/rc5.o \ ciphers/rc6.o \ - ciphers/safer/safer.o \ - ciphers/safer/saferp.o \ - ciphers/skipjack.o \ ciphers/twofish/twofish.o \ - ciphers/xtea.o \ encauth/ccm/ccm_add_aad.o \ encauth/ccm/ccm_add_nonce.o \ encauth/ccm/ccm_done.o \ @@ -384,14 +384,6 @@ LTCOBJ= \ encauth/chachapoly/chacha20poly1305_setiv.o \ encauth/chachapoly/chacha20poly1305_setiv_rfc7905.o \ encauth/chachapoly/chacha20poly1305_test.o \ - encauth/eax/eax_addheader.o \ - encauth/eax/eax_decrypt.o \ - encauth/eax/eax_decrypt_verify_memory.o \ - encauth/eax/eax_done.o \ - encauth/eax/eax_encrypt.o \ - encauth/eax/eax_encrypt_authenticate_memory.o \ - encauth/eax/eax_init.o \ - encauth/eax/eax_test.o \ encauth/gcm/gcm_add_aad.o \ encauth/gcm/gcm_add_iv.o \ encauth/gcm/gcm_done.o \ @@ -437,9 +429,6 @@ LTCOBJ= \ hashes/helper/hash_filehandle.o \ hashes/helper/hash_memory.o \ hashes/helper/hash_memory_multi.o \ - hashes/md2.o \ - hashes/md4.o \ - hashes/md5.o \ hashes/rmd128.o \ hashes/rmd160.o \ hashes/rmd256.o \ @@ -453,7 +442,6 @@ LTCOBJ= \ hashes/sha2/sha512_256.o \ hashes/sha3.o \ hashes/sha3_test.o \ - hashes/tiger.o \ hashes/whirl/whirl.o \ mac/blake2/blake2bmac.o \ mac/blake2/blake2bmac_file.o \ @@ -465,13 +453,6 @@ LTCOBJ= \ mac/blake2/blake2smac_memory.o \ mac/blake2/blake2smac_memory_multi.o \ mac/blake2/blake2smac_test.o \ - mac/f9/f9_done.o \ - mac/f9/f9_file.o \ - mac/f9/f9_init.o \ - mac/f9/f9_memory.o \ - mac/f9/f9_memory_multi.o \ - mac/f9/f9_process.o \ - mac/f9/f9_test.o \ mac/hmac/hmac_done.o \ mac/hmac/hmac_file.o \ mac/hmac/hmac_init.o \ @@ -706,13 +687,6 @@ LTCOBJ= \ pk/ecc/ltc_ecc_points.o \ pk/ecc/ltc_ecc_projective_add_point.o \ pk/ecc/ltc_ecc_projective_dbl_point.o \ - pk/katja/katja_decrypt_key.o \ - pk/katja/katja_encrypt_key.o \ - pk/katja/katja_export.o \ - pk/katja/katja_exptmod.o \ - pk/katja/katja_free.o \ - pk/katja/katja_import.o \ - pk/katja/katja_make_key.o \ pk/pkcs1/pkcs_1_i2osp.o \ pk/pkcs1/pkcs_1_mgf1.o \ pk/pkcs1/pkcs_1_oaep_decode.o \ @@ -738,10 +712,8 @@ LTCOBJ= \ pk/rsa/rsa_verify_hash.o \ prngs/chacha20.o \ prngs/fortuna.o \ - prngs/rc4.o \ prngs/rng_get_bytes.o \ prngs/rng_make_prng.o \ - prngs/sober128.o \ prngs/sprng.o \ prngs/yarrow.o \ stream/chacha/chacha_crypt.o \ @@ -750,13 +722,47 @@ LTCOBJ= \ stream/chacha/chacha_ivctr64.o \ stream/chacha/chacha_keystream.o \ stream/chacha/chacha_setup.o \ - stream/chacha/chacha_test.o \ - stream/rc4/rc4_stream.o \ - stream/rc4/rc4_test.o \ - stream/sober128/sober128_stream.o \ - stream/sober128/sober128_test.o - -libtomcrypt/%.o: CFLAGS+=-DTFM_DESC -Isrc/headers -Itomsfastmath/src/headers -DARGTYPE=4 -DLTC_NO_ASM -DTFM_NO_ASM -Ilibtomcrypt/src/headers -DLTC_SOURCE + stream/chacha/chacha_test.o + +libtomcrypt/%.o: CFLAGS+= -Isrc/headers -Itomsfastmath/src/headers -DARGTYPE=4 -Ilibtomcrypt/src/headers +libtomcrypt/%.o: CFLAGS+= \ + -DTFM_DESC \ + -DTFM_NO_ASM \ + -DLTC_NOTHING \ + -DLTC_NO_ASM \ + -DLTC_SOURCE \ + -DLTC_POLY1305 \ + -DLTC_CHACHA20POLY1305_MODE \ + -DLTC_RIJNDAEL \ + -DLTC_CHACHA \ + -DLTC_ECB_MODE \ + -DLTC_CBC_MODE \ + -DLTC_CTR_MODE \ + -DLTC_GCM_MODE \ + -DLTC_SHA1 \ + -DLTC_SHA3 \ + -DLTC_SHA512 \ + -DLTC_SHA384 \ + -DLTC_SHA256 \ + -DLTC_SHA224 \ + -DLTC_HASH_HELPERS \ + -DLTC_HMAC \ + -DLTC_OMAC \ + -DLTC_CCM_MODE \ + -DLTC_SPRNG \ + -DLTC_YARROW \ + -DLTC_DEVRANDOM \ + -DLTC_TRY_URANDOM_FIRST \ + -DLTC_RNG_GET_BYTES \ + -DLTC_RNG_MAKE_PRNG \ + -DLTC_DER \ + -DLTC_MRSA \ + -DLTC_MECC \ + -DLTC_BASE64 + +tomclean: + rm -f $(addprefix libtomcrypt/src/, $(LTCOBJ)) + rm -f ltc.o ltc.o: $(addprefix libtomcrypt/src/, $(LTCOBJ)) ld -o $@ -r $+ @@ -767,9 +773,9 @@ crypto/rfc3986.c: crypto/rfc3986.re rfc3986: rfc3986.c $(CC) -Wall -W -Wextra -Werror -o $@ $+ -src/fetchurl.o: CFLAGS+=-DTFM_DESC -Isrc/headers -Itomsfastmath/src/headers -DARGTYPE=4 -DLTC_NO_ASM -DTFM_NO_ASM -Ilibtomcrypt/src/headers -DLTC_SOURCE -Icrypto -Wno-pointer-sign -DDEBUG +src/fetchurl.o: CFLAGS+=-DTFM_DESC -Isrc/headers -Itomsfastmath/src/headers -DARGTYPE=4 -DLTC_NO_ASM -DTFM_NO_ASM -Ilibtomcrypt/src/headers -DLTC_SOURCE -Icrypto -Wno-pointer-sign -zpm-fetchurl: ltc.o tls.o tfm.o src/fetchurl.o crypto/https.o crypto/rfc3986.o +bin/zpm-fetchurl: ltc.o crypto/tls.o tfm.o src/fetchurl.o crypto/https.o crypto/rfc3986.o $(CC) $(CFLAGS) -static -o $@ $+ testddg: zpm-fetchurl @@ -779,6 +785,7 @@ testgra: zpm-fetchurl ./zpm-fetchurl granicus.if.org 443 / SIGNSRC= \ +crypto/libeddsa/sign.c \ crypto/libeddsa/lib/burn.c \ crypto/libeddsa/lib/burnstack.c \ crypto/libeddsa/lib/ed.c \ @@ -786,15 +793,18 @@ crypto/libeddsa/lib/ed25519-sha512.c \ crypto/libeddsa/lib/fld.c \ crypto/libeddsa/lib/sc.c \ crypto/libeddsa/lib/sha512.c \ -crypto/libeddsa/lib/x25519.c \ -crypto/libeddsa/sign.c +crypto/libeddsa/lib/x25519.c -SIGNOBJ=$(SIGNSRC:.c=.o) +SIGNOBJ=$(SIGNSRC:.c=.o) lib/readpass.o lib/blake2b.o \ + crypto/chacha.o -$(SIGNOBJ): CFLAGS+=-Icrypto/libeddsa/lib +$(SIGNOBJ): CFLAGS=-Wall -Wextra -W -Werror -Wno-pointer-sign \ + -Wno-missing-braces \ + -Icrypto/libeddsa/lib -Wno-unused-command-line-argument \ + -I. -zpm-sign: $(SIGNOBJ) - $(CC) $(CFLAGS) -static -o $@ $+ +bin/zpm-sign: $(SIGNOBJ) + $(CC) -Wall -Wextra -W -Werror -Wno-unused-command-line-argument -static -o $@ $+ clean: rm -f *.o sqlite/*.o lib/*.o $(LZMAOBJ) liblzma.a \ @@ -809,4 +819,5 @@ clean: $(addprefix crypto/, $(TLSOBJ)) \ $(addprefix tomsfastmath/src/, $(TFMOBJ)) \ $(addprefix libtomcrypt/src/, $(LTCOBJ)) \ + $(SIGNOBJ) \ x25519.o