f7951c2 Fix pkg annotate regression test script — HardenedBSD-pkg

HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix pkg annotate regression test script

Baptiste Daroussin committed 11 years ago

commit f7951c2c64b89294d92f3147b47f3a672539cdce
parent b966f0c

5 files changed +139 -128

modified tests/frontend/annotate.sh

@@ -4,24 +4,22 @@ atf_test_case annotate

 annotate_head() {
 	atf_set "descr" "pkg annotate"
 	atf_set "require.files" \
 	   "$(atf_get_srcdir)/png-1.5.14.yaml $(atf_get_srcdir)/sqlite3-3.7.14.1.yaml"
 	   "$(atf_get_srcdir)/png.ucl $(atf_get_srcdir)/sqlite3.ucl"
 }
 annotate_body() {
         export PKG_DBDIR=$HOME/pkg
         export INSTALL_AS_USER=yes
 	export PKG_DBDIR=.
 	mkdir -p $PKG_DBDIR || atf_fail "can't create $PKG_DBDIR"
 	for pkg in 'png-1.5.14' 'sqlite3-3.7.14.1' ; do
 	for pkg in 'png' 'sqlite3' ; do
 	    atf_check \
 		-o empty \
 		-o match:"^Installing.*\.\.\.$" \
 		-e empty \
 		-s exit:0 \
 		pkg register -t -M $(atf_get_srcdir)/$pkg.yaml
 		pkg register -t -M $(atf_get_srcdir)/$pkg.ucl
 	done
 	[ -f "$PKG_DBDIR/local.sqlite" ] || \
 	[ -f "./local.sqlite" ] || \
 	    atf_fail "Can't populate $PKG_DBDIR/local.sqlite"
         atf_check \

deleted tests/frontend/png-1.5.14.yaml

@@ -1,63 +0,0 @@

 ---
 name: png
 version: 1.5.14
 origin: graphics/png
 comment: Library for manipulating PNG images
 arch: freebsd:9:x86:64
 www: http://www.libpng.org/pub/png/libpng.html
 maintainer: dinoex@FreeBSD.org
 prefix: /usr/local
 licenselogic: single
 flatsize: 950722
 desc: |-
   Libpng was written as a companion to the PNG specification, as a
   way to reduce the amount of time and effort it takes to support
   the PNG file format in application programs.  Most users will not
   have to modify the library significantly; advanced users may want
   to modify it more.  The library was coded for both users.  All
   attempts were made to make it as complete as possible, while
   keeping the code easy to understand.  Currently, this library
   only supports C.  Support for other languages is being considered.
   LICENSE: libpng license
   WWW: http://www.libpng.org/pub/png/libpng.html
        http://libpng.sourceforge.net/
 categories:
 - graphics
 shlibs_provided:
 - libpng15.so.15
 options: {APNG: on}
 files:
   /usr/local/bin/libpng-config: '-'
   /usr/local/bin/libpng15-config: fce84058ddcee62fb6893c82856eafb387d87360078bbba3066281ef1c007580
   /usr/local/include/libpng15/png.h: ced85c2c298d4fbf56806f4f3605c56881022fcae970169974e0d689af344484
   /usr/local/include/libpng15/pngconf.h: c6e63174498c29788a024cfe3a2c83008820aa29b353e984afb547db87b9bbba
   /usr/local/include/libpng15/pngdebug.h: e22cee0df3e0eb2b6032503d3e8a6072331619a20a04e14e36c130620d450002
   /usr/local/include/libpng15/pnginfo.h: 2e85da648d41c22b9797ba334f0d8ec589bf94e59e845c2c83e68ace1a1d8add
   /usr/local/include/libpng15/pnglibconf.h: ab92423f8cf36cb16442fdf8ca110f059dbc6e4ac8789e59fae53dcf4fea1215
   /usr/local/include/libpng15/pngpriv.h: 4409e8b23e912f3cbe6032c9ddd94481dabee5840bb0e0071e17bd17d25de985
   /usr/local/include/libpng15/pngstruct.h: fe78f8deaa68ef2d4a289671e8dec1adbec8a474221675575cc2ce85ee505f5b
   /usr/local/include/png.h: ced85c2c298d4fbf56806f4f3605c56881022fcae970169974e0d689af344484
   /usr/local/include/pngconf.h: c6e63174498c29788a024cfe3a2c83008820aa29b353e984afb547db87b9bbba
   /usr/local/include/pnglibconf.h: ab92423f8cf36cb16442fdf8ca110f059dbc6e4ac8789e59fae53dcf4fea1215
   /usr/local/lib/libpng.a: '-'
   /usr/local/lib/libpng.so: '-'
   /usr/local/lib/libpng/libpng15-release.cmake: 332b9072bac3af84917c386b5bb2b0e1ce2799c2c5e4df52a92bb244a9d064b1
   /usr/local/lib/libpng/libpng15.cmake: c62ccb15cfe9d6ce8cbc440f9d5fafda8bc14742ef295b1772f8b85f53cd5fab
   /usr/local/lib/libpng15.a: 57fb97e396c3e1f2812b47028e9d6546124cff0d375c54715a9c0628c4d25430
   /usr/local/lib/libpng15.so: '-'
   /usr/local/lib/libpng15.so.15: aec82d341b6400bb9d9487e42566097bceffe69ed8d49061e225bbbc8d408712
   /usr/local/libdata/pkgconfig/libpng.pc: '-'
   /usr/local/libdata/pkgconfig/libpng15.pc: aae3a29236d7f2ac53d470c2a9fc6bdddcd25b78dfed9262a18cbfe5a614d35b
   /usr/local/man/man3/libpng.3.gz: a9c178013fbbace00e665dea56d199755a25c88e270735f1cc0da5a0ebb513b2
   /usr/local/man/man3/libpngpf.3.gz: d4e6a87b8989931b0603551916428464afe35dd203a769fa0b9082867f0d5781
   /usr/local/man/man5/png.5.gz: a949a443337561a03d5c828268ab78b5ef69cf9b73e697c1392b59f056c91f0e
 directories:
   /usr/local/lib/libpng/: n
   /usr/local/include/libpng15/: n
 scripts:
   post-install: |
     /sbin/ldconfig -m /usr/local/lib
   post-deinstall: |
     /sbin/ldconfig -R

added tests/frontend/png.ucl

@@ -0,0 +1,63 @@

 ---
 name: png
 version: 1.5.14
 origin: graphics/png
 comment: Library for manipulating PNG images
 arch: freebsd:9:x86:64
 www: http://www.libpng.org/pub/png/libpng.html
 maintainer: dinoex@FreeBSD.org
 prefix: /usr/local
 licenselogic: single
 flatsize: 950722
 desc: |-
   Libpng was written as a companion to the PNG specification, as a
   way to reduce the amount of time and effort it takes to support
   the PNG file format in application programs.  Most users will not
   have to modify the library significantly; advanced users may want
   to modify it more.  The library was coded for both users.  All
   attempts were made to make it as complete as possible, while
   keeping the code easy to understand.  Currently, this library
   only supports C.  Support for other languages is being considered.
   LICENSE: libpng license
   WWW: http://www.libpng.org/pub/png/libpng.html
        http://libpng.sourceforge.net/
 categories:
 - graphics
 shlibs_provided:
 - libpng15.so.15
 options: {APNG: on}
 files:
   /usr/local/bin/libpng-config: '-'
   /usr/local/bin/libpng15-config: fce84058ddcee62fb6893c82856eafb387d87360078bbba3066281ef1c007580
   /usr/local/include/libpng15/png.h: ced85c2c298d4fbf56806f4f3605c56881022fcae970169974e0d689af344484
   /usr/local/include/libpng15/pngconf.h: c6e63174498c29788a024cfe3a2c83008820aa29b353e984afb547db87b9bbba
   /usr/local/include/libpng15/pngdebug.h: e22cee0df3e0eb2b6032503d3e8a6072331619a20a04e14e36c130620d450002
   /usr/local/include/libpng15/pnginfo.h: 2e85da648d41c22b9797ba334f0d8ec589bf94e59e845c2c83e68ace1a1d8add
   /usr/local/include/libpng15/pnglibconf.h: ab92423f8cf36cb16442fdf8ca110f059dbc6e4ac8789e59fae53dcf4fea1215
   /usr/local/include/libpng15/pngpriv.h: 4409e8b23e912f3cbe6032c9ddd94481dabee5840bb0e0071e17bd17d25de985
   /usr/local/include/libpng15/pngstruct.h: fe78f8deaa68ef2d4a289671e8dec1adbec8a474221675575cc2ce85ee505f5b
   /usr/local/include/png.h: ced85c2c298d4fbf56806f4f3605c56881022fcae970169974e0d689af344484
   /usr/local/include/pngconf.h: c6e63174498c29788a024cfe3a2c83008820aa29b353e984afb547db87b9bbba
   /usr/local/include/pnglibconf.h: ab92423f8cf36cb16442fdf8ca110f059dbc6e4ac8789e59fae53dcf4fea1215
   /usr/local/lib/libpng.a: '-'
   /usr/local/lib/libpng.so: '-'
   /usr/local/lib/libpng/libpng15-release.cmake: 332b9072bac3af84917c386b5bb2b0e1ce2799c2c5e4df52a92bb244a9d064b1
   /usr/local/lib/libpng/libpng15.cmake: c62ccb15cfe9d6ce8cbc440f9d5fafda8bc14742ef295b1772f8b85f53cd5fab
   /usr/local/lib/libpng15.a: 57fb97e396c3e1f2812b47028e9d6546124cff0d375c54715a9c0628c4d25430
   /usr/local/lib/libpng15.so: '-'
   /usr/local/lib/libpng15.so.15: aec82d341b6400bb9d9487e42566097bceffe69ed8d49061e225bbbc8d408712
   /usr/local/libdata/pkgconfig/libpng.pc: '-'
   /usr/local/libdata/pkgconfig/libpng15.pc: aae3a29236d7f2ac53d470c2a9fc6bdddcd25b78dfed9262a18cbfe5a614d35b
   /usr/local/man/man3/libpng.3.gz: a9c178013fbbace00e665dea56d199755a25c88e270735f1cc0da5a0ebb513b2
   /usr/local/man/man3/libpngpf.3.gz: d4e6a87b8989931b0603551916428464afe35dd203a769fa0b9082867f0d5781
   /usr/local/man/man5/png.5.gz: a949a443337561a03d5c828268ab78b5ef69cf9b73e697c1392b59f056c91f0e
 directories:
   /usr/local/lib/libpng/: n
   /usr/local/include/libpng15/: n
 scripts:
   post-install: |
     /sbin/ldconfig -m /usr/local/lib
   post-deinstall: |
     /sbin/ldconfig -R

deleted tests/frontend/sqlite3-3.7.14.1.yaml

@@ -1,57 +0,0 @@

 ---
 name: sqlite3
 version: 3.7.14.1
 origin: databases/sqlite3
 comment: An SQL database engine in a C library
 arch: freebsd:9:x86:64
 www: http://www.sqlite.org/
 maintainer: pavelivolkov@gmail.com
 prefix: /usr/local
 licenselogic: single
 licenses:
 - public
 flatsize: 2590316
 desc: |-
   SQLite is an SQL database engine in a C library. Programs that link the SQLite
   library can have SQL database access without running a separate RDBMS process.
   The distribution comes with a standalone command-line access program (sqlite)
   that can be used to administer an SQLite database and which serves as an
   example of how to use the SQLite library.
   WWW: http://www.sqlite.org/
 deps:
   pkgconf: {origin: devel/pkgconf, version: 0.9.1_2}
 categories:
 - databases
 shlibs_required:
 - libsqlite3.so.8
 shlibs_provided:
 - libsqlite3.so.8
 options: {FTS3: off, ICU: off, RTREE: off, RAMTABLE: off, UPD_DEL_LIMIT: off, URI: off,
   SOUNDEX: off, METADATA: off, STAT3: off, DIRECT_READ: off, MEMMAN: on, SECURE_DELETE: on,
   UNLOCK_NOTIFY: on, THREADSAFE: on, EXTENSION: on}
 files:
   /usr/local/bin/sqlite3: 238570ccb8b0ffa613c298750056f1a8fa81fe8201caabdf57fdac44ba57da3c
   /usr/local/include/sqlite3.h: 3b515035ac6ff5d9ec6d53b249d99453b89f81b1efbfa843c957682332cdcd71
   /usr/local/include/sqlite3ext.h: b8d4e35c2c64c707be673bd74737405d97e503db32f825ca43a5ccafcbbc0d20
   /usr/local/lib/libsqlite3.a: 7a6386b56cf663de3f9ce2ce297059710d992636f5e2c372c149b8880c56588d
   /usr/local/lib/libsqlite3.la: 27668c83d6d646ae01036ea668be6059fe09f0d5840f6ed2bec942e507bac126
   /usr/local/lib/libsqlite3.so: '-'
   /usr/local/lib/libsqlite3.so.8: 04bb5c89c4ec51a0c9827318ede58c95d25868524ef5727fe56f625f9e1ba608
   /usr/local/libdata/pkgconfig/sqlite3.pc: ec35e89649260a8c8e30db62b489dde27314279984a067d2b23a004f8181861e
   /usr/local/man/man1/sqlite3.1.gz: 2e1a5fa7d5402d0569070b1e8880aa1a535ba21023dc39211ecbad0433d076b6
   /usr/local/share/licenses/sqlite3-3.7.14.1/LICENSE: 8402e9d907c9f12647832648c5941d3be53e33f9832bf0bf1a30b8e88cfa7513
   /usr/local/share/licenses/sqlite3-3.7.14.1/catalog.mk: 667044d924e0b32e14f9aea7f15dc8cee28def7e4c446aa088b4edef656c4217
   /usr/local/share/licenses/sqlite3-3.7.14.1/public: b4321e78d0be51d4397b0647c9ab18cf0805fd438660aee7b5c052811f755f78
 directories:
   /usr/local/share/licenses/sqlite3-3.7.14.1/: n
   /usr/local/share/licenses/: y
 scripts:
   post-install: |
     /sbin/ldconfig -m /usr/local/lib
     cd /usr/local
   pre-deinstall: |
     /sbin/ldconfig -R
     cd /usr/local
   post-deinstall: |
     cd /usr/local

added tests/frontend/sqlite3.ucl

@@ -0,0 +1,70 @@

 name: "sqlite3"
 origin: "databases/sqlite3"
 version: "3.8.5_1"
 arch: "freebsd:10:x86:64"
 maintainer: "pavelivolkov@gmail.com"
 prefix: "/usr/local"
 www: "https://www.sqlite.org/"
 flatsize: 2742805
 comment: "SQL database engine in a C library"
 licenselogic: "single"
 licenses: [
     "public"
 ]
 desc: "SQLite is an SQL database engine in a C library. Programs that link the SQLite\nlibrary can have SQL database access without running a separate RDBMS process.\nThe distribution comes with a standalone command-line access program (sqlite)\nthat can be used to administer an SQLite database and which serves as an\nexample of how to use the SQLite library.\n\nWWW: https://www.sqlite.org/"
 categories: [
     "databases"
 ]
 shlibs_provided: [
     "libsqlite3.so.0"
 ]
 options: {
     DIRECT_READ: "off",
     EXTENSION: "on",
     FTS4: "on",
     ICU: "off",
     MEMMAN: "off",
     METADATA: "on",
     RTREE: "on",
     RTREE_INT: "off",
     SECURE_DELETE: "on",
     SOUNDEX: "off",
     STAT3: "off",
     STAT4: "off",
     THREADS: "on",
     TS0: "off",
     TS1: "on",
     TS2: "off",
     TS3: "off",
     UNICODE61: "off",
     UNLOCK_NOTIFY: "on",
     UPD_DEL_LIMIT: "off",
     URI: "on",
     URI_AUTHORITY: "off"
 }
 annotations: {
     repo_type: "binary"
 }
 files: {
     /usr/local/bin/sqlite3: "f70722143b139bceda62eb54b99f9e6464b7d35c6368b2b47799cddb136280ce",
     /usr/local/include/sqlite3.h: "e06f562f97ea7bf8d49d7617ba358ff3bd8ed1a74433a5b50d649e8c97ac27b6",
     /usr/local/include/sqlite3ext.h: "620d8b84b8d8b8bea394dc5b9e6a98b0367218273ad0a4412cbb0cd3ce9be686",
     /usr/local/lib/libsqlite3.a: "5bf048d4db0b362af4d6684ee83227c62747de339b9f58bd02da0ba9c2b301b5",
     /usr/local/lib/libsqlite3.so: "-",
     /usr/local/lib/libsqlite3.so.0: "-",
     /usr/local/lib/libsqlite3.so.0.8.6: "66b1e45bbcdb204ccb7c981ef5031722eb8a2c7a5b9fc27c824d99f742da9eeb",
     /usr/local/libdata/pkgconfig/sqlite3.pc: "5697aee54ba1f283ecac874b37f5a85e5ae4120d73da4ebb5c44544991bdb31a",
     /usr/local/man/man1/sqlite3.1.gz: "b6d58505d378faa5abe126400ebdcc25e72abdf7e65e4a39e48a91cc81a5ebb3",
     /usr/local/share/licenses/sqlite3-3.8.5_1/LICENSE: "8402e9d907c9f12647832648c5941d3be53e33f9832bf0bf1a30b8e88cfa7513",
     /usr/local/share/licenses/sqlite3-3.8.5_1/catalog.mk: "5764450bfb26e77ed32c57f19a4f64955c7c8297f44f30e40d4009986b67521c",
     /usr/local/share/licenses/sqlite3-3.8.5_1/public: "b4321e78d0be51d4397b0647c9ab18cf0805fd438660aee7b5c052811f755f78"
 }
 directories: {
     /usr/local/share/licenses/sqlite3-3.8.5_1/: "n",
     /usr/local/share/licenses/: "y"
 }
 scripts: {
     post-install: "/sbin/ldconfig -m /usr/local/lib\ncd /usr/local",
     pre-deinstall: "cd /usr/local",
     post-deinstall: "/sbin/ldconfig -R\ncd /usr/local"
 }