...
 
Commits (3)
......@@ -22,7 +22,7 @@ install-LUA_LIB-y := $(INSTALLDIR) $(DESTDIR)$(LUA_LIBDIR) && \
$(INSTALL) $(LUA_LIB-y) $(DESTDIR)$(LUA_LIBDIR)
endif
progs-y += apk
progs-y += apk
apk-objs := apk.o add.o del.o fix.o update.o info.o list.o \
search.o upgrade.o cache.o ver.o index.o fetch.o \
audit.o verify.o dot.o policy.o stats.o manifest.o
......@@ -33,7 +33,7 @@ libapk.so-objs := common.o database.o package.o archive.o \
libapk.so-libs := libfetch/libfetch.a
ifeq ($(TEST),y)
progs-y += apk-test
progs-y += apk-test
apk-test-objs := apk-test.o $(filter-out apk.o, $(apk-objs))
endif
......@@ -45,6 +45,8 @@ apk-libs += $(libapk.so-libs)
apk-test-libs += $(libapk.so-libs)
apk.so-libs += $(libapk.so-libs)
else
apk.static-objs := $(libapk.so-objs)
apk.static-libs := $(libapk.so-libs)
LIBAPK := YesPlease
LIBS_apk := -lapk
LIBS_apk-test := -lapk
......@@ -66,15 +68,11 @@ CFLAGS_apk.o := -DAPK_VERSION=\"$(FULL_VERSION)\"
CFLAGS_apk-static.o := -DAPK_VERSION=\"$(FULL_VERSION)\" -DOPENSSL_NO_ENGINE
CFLAGS_apk-test.o := -DAPK_VERSION=\"$(FULL_VERSION)\" -DOPENSSL_NO_ENGINE -DTEST_MODE
progs-$(STATIC) += apk.static
apk.static-objs := $(filter-out apk.o,$(apk-objs)) apk-static.o
apk.static-libs := $(apk-libs)
ifneq ($(SHARED_LIBAPK),)
apk.static-objs += $(libapk.so-objs)
apk.static-libs += $(libapk.so-libs)
endif
progs-$(STATIC) += apk.static
apk.static-objs += $(filter-out apk.o,$(apk-objs)) apk-static.o
apk.static-libs += $(apk-libs)
LDFLAGS_apk.static := -static
LIBS_apk.static := -Wl,--as-needed -ldl -Wl,--no-as-needed
LIBS_apk.static := -Wl,--as-needed -ldl -Wl,--no-as-needed
LDFLAGS_apk += -L$(obj)
LDFLAGS_apk-test += -L$(obj)
LDFLAGS_libapk.so += -Wl,-soname,$(LIBAPK_SONAME)
......@@ -96,4 +94,3 @@ install: $(obj)/apk $(LIBAPK-y) $(LUA_LIB-y)
$(INSTALL) $(obj)/apk $(DESTDIR)$(SBINDIR)
$(install-LIBAPK-y)
$(install-LUA_LIB-y)
......@@ -122,7 +122,7 @@ extern char **apk_argv;
#define APK_MAX_TAGS 16 /* see solver; unsigned short */
#define APK_CACHE_CSUM_BYTES 4
time_t apk_time(void);
time_t apk_time(void) __attribute__((weak));
static inline size_t apk_calc_installed_size(size_t size)
{
......
/* md5.h - Compute MD5 checksum of files or strings according to the
* definition of MD5 in RFC 1321 from April 1992.
* Copyright (C) 1995-1999 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef MD5_H
#define MD5_H
#include <sys/types.h>
typedef unsigned char md5sum_t[16];
typedef u_int32_t md5_uint32;
struct md5_ctx
{
md5_uint32 A;
md5_uint32 B;
md5_uint32 C;
md5_uint32 D;
md5_uint32 total[2];
md5_uint32 buflen;
char buffer[128];
};
/* Initialize structure containing state of computation.
(RFC 1321, 3.3: Step 3) */
void md5_init(struct md5_ctx *ctx);
/* Starting with the result of former calls of this function (or the
initialization function update the context for the next LEN bytes
starting at BUFFER.
It is NOT required that LEN is a multiple of 64. */
void md5_process(struct md5_ctx *ctx, const void *buffer, size_t len);
/* Process the remaining bytes in the buffer and put result from CTX
in first 16 bytes following RESBUF. The result is always in little
endian byte order, so that a byte-wise output yields to the wanted
ASCII representation of the message digest.
IMPORTANT: On some systems it is required that RESBUF is correctly
aligned for a 32 bits value. */
void md5_finish(struct md5_ctx *ctx, md5sum_t resbuf);
#endif