dnaeon

ewaf-test:/# apt-get install ewafermapping-ui
Reading package lists... Done
Building dependency tree       
Reading state information... Done
The following packages will be upgraded:
  ewafermapping-ui
1 upgraded, 0 newly installed, 0 to remove and 3 not upgraded.
Need to get 16.5MB of archives.
After this operation, 1516kB of additional disk space will be used.
WARNING: The following packages cannot be authenticated!

dnaeon

mysql> select user_id, user_name from user order by user_id asc;
+---------+-----------+
| user_id | user_name |
+---------+-----------+
|       1 | Bsdcadmin | 
|      70 | Pka       | 
|      73 | Onm       | 
|      76 | Er        | 
|      78 | Bxy       | 
|      79 | Pvm       | 

dnaeon

# System-wide configuration file for pkg(1)
# For more information on the file format and 
# options please refer to the pkg.conf(5) man page

PKG_DBDIR : /var/db/pkg
PKG_DBCACHE : /var/cache/pkg
PKG_MULTIREPOS : YES
#ASSUME_ALWAYS_YES   : YES

repos:

dnaeon

smx@root> list| grep 1.2.0.3
[ 122] [Active     ] [            ] [       ] [   60] Apache ServiceMix :: Bundles :: xmlresolver (1.2.0.3)
[ 407] [Active     ] [            ] [       ] [   60] melexis libth01 (1.2.0.3)
[ 408] [Active     ] [            ] [       ] [   60] dto (1.2.0.3)
[ 409] [Resolved   ] [            ] [       ] [   60] Electronic Wafermapping :: Dao (1.2.0.3)
[ 411] [Active     ] [            ] [Started] [   60] Electronic Wafermapping :: Template engine (1.2.0.3)
[ 412] [Active     ] [            ] [       ] [   60] converter (1.2.0.3)
[ 413] [Active     ] [            ] [       ] [   60] Collection plan import :: Lot Converter (1.2.0.3)
[ 414] [Active     ] [            ] [Started] [   60] Electronic Wafermapping :: Wafermap store (1.2.0.3)
[ 415] [Active     ] [            ] [Started] [   60] Electronic Wafermapping :: Wmdb interface (1.2.0.3)

dnaeon

pkgdb.c:1179:22: warning: implicit declaration of function 'pw_make' is invalid in C99 [-Wimplicit-function-declaration]
                strlcpy(u->uidstr, pw_make(pwd), sizeof(u->uidstr));
                                   ^
pkgdb.c:1179:22: warning: incompatible integer to pointer conversion passing 'int' to parameter of type 'const char *'
                strlcpy(u->uidstr, pw_make(pwd), sizeof(u->uidstr));
                                   ^~~~~~~~~~~~
/usr/include/string.h:90:59: note: passing argument to parameter here
size_t   strlcpy(char * __restrict, const char * __restrict, size_t);
                                                           ^
pkgdb.c:1207:22: warning: implicit declaration of function 'gr_make' is invalid in C99 [-Wimplicit-function-declaration]

dnaeon

diff --git a/libpkg/pkg_config.c b/libpkg/pkg_config.c
index 25acb71..d8a330b 100644
--- a/libpkg/pkg_config.c
+++ b/libpkg/pkg_config.c
@@ -21,6 +21,7 @@ static struct _config {
        { "PKG_CACHEDIR", "/var/cache/pkg", NULL},
        { "PORTSDIR", "/usr/ports", NULL },
        { "PUBKEY", "/etc/ssl/pkg.pub", NULL },
+       { "ASSUME_ALWAYS_YES", "false", NULL },

dnaeon

diff --git a/pkg/query.c b/pkg/query.c
index 69bb6c7..ad6786e 100644
--- a/pkg/query.c
+++ b/pkg/query.c
@@ -12,6 +12,38 @@
 
 #include "query.h"
 
+static struct query_flags {
+        const char flag;

dnaeon

#include <sys/param.h>
#include <sys/jail.h>
#include <sys/uio.h>
#include <arpa/inet.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>

#include <jail.h>
#include <stdio.h>

dnaeon

tsunami# pkg 
usage: pkg [-d] [-j <jail name or id>|-c <chroot path>] <command> [<args>]

Global options supported:
        -d             Increment debug level
        -j             Execute pkg(1) inside a jail(8)
        -c             Execute pkg(1) inside a chroot(8)

Commands supported:
        add            Registers a package and installs it on the system

dnaeon

diff --git a/pkg/main.c b/pkg/main.c
index ce03bef..c85d89e 100644
--- a/pkg/main.c
+++ b/pkg/main.c
@@ -37,27 +37,28 @@ static int exec_help(int, char **);
 
 static struct commands {
        const char * const name;
+       const char * const desc;
        int (*exec)(int argc, char **argv);