Skip to content

Commit

Permalink
Merge pull request #1398 from darlinghq/fedora_38_fix
Browse files Browse the repository at this point in the history
Fix Building For Fedora 38
  • Loading branch information
CuriousTommy authored Jun 29, 2023
2 parents 894d62c + ef72de6 commit 7bb0dbb
Show file tree
Hide file tree
Showing 41 changed files with 231 additions and 272 deletions.
2 changes: 1 addition & 1 deletion src/external/IOKitUser
2 changes: 1 addition & 1 deletion src/external/Libinfo
2 changes: 1 addition & 1 deletion src/external/OpenDirectory
2 changes: 1 addition & 1 deletion src/external/OpenLDAP
2 changes: 1 addition & 1 deletion src/external/WTF
Submodule WTF updated 1 files
+4 −0 wtf/URLHelpers.cpp
2 changes: 1 addition & 1 deletion src/external/apr
2 changes: 1 addition & 1 deletion src/external/crontabs
2 changes: 1 addition & 1 deletion src/external/dtrace
2 changes: 1 addition & 1 deletion src/external/libc
2 changes: 1 addition & 1 deletion src/external/libdispatch
Submodule libdispatch updated 1 files
+1 −1 CMakeLists.txt
2 changes: 1 addition & 1 deletion src/external/libstdcxx
Submodule libstdcxx updated 1 files
+1 −0 CMakeLists.txt
2 changes: 1 addition & 1 deletion src/external/libtrace
2 changes: 1 addition & 1 deletion src/external/libxml2
Submodule libxml2 updated 1 files
+1 −1 CMakeLists.txt
2 changes: 1 addition & 1 deletion src/external/libxpc
2 changes: 1 addition & 1 deletion src/external/passwordserver_sasl
2 changes: 1 addition & 1 deletion src/external/perl
Submodule perl updated 1 files
+4 −0 5.18/perl/doio.c
2 changes: 1 addition & 1 deletion src/external/python
2 changes: 1 addition & 1 deletion src/external/ruby
Submodule ruby updated 1 files
+2 −0 CMakeLists.txt
2 changes: 1 addition & 1 deletion src/external/syslog
3 changes: 3 additions & 0 deletions src/frameworks/CoreVideo/include/CoreVideo/CVPixelBuffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include <sys/cdefs.h>
#include <CoreVideo/CVImageBuffer.h>
#include <CoreVideo/CVReturn.h>

__BEGIN_DECLS

Expand Down Expand Up @@ -78,8 +79,10 @@ enum
extern const CFStringRef kCVPixelBufferMetalCompatibilityKey;

typedef CVImageBufferRef CVPixelBufferRef;
typedef void (*CVPixelBufferReleaseBytesCallback)(void *releaseRefCon, const void *baseAddress);

// TODO: This header file is incomplete
CVReturn CVPixelBufferCreateWithBytes(CFAllocatorRef allocator, size_t width, size_t height, OSType pixelFormatType, void *baseAddress, size_t bytesPerRow, CVPixelBufferReleaseBytesCallback releaseCallback, void *releaseRefCon, CFDictionaryRef pixelBufferAttributes, CVPixelBufferRef _Nullable *pixelBufferOut);

__END_DECLS

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@

#include <LocalAuthentication/LAPublicDefines.h>
#include <CoreFoundation/CFBase.h>
#include <CoreFoundation/CFDictionary.h>
#include <CoreFoundation/CFError.h>

#include <sys/types.h>
#include <stdbool.h>

CF_EXTERN_C_BEGIN

Expand All @@ -19,6 +24,9 @@ typedef void* (*LAFunctionCopyExternalizedContext)(void*);
static CFIndex kLAOptionNotInteractive = 1;
static CFIndex kLAOptionCallerName = 2;

bool LAEvaluatePolicy(CFTypeRef context, int policy, CFMutableDictionaryRef options, CFErrorRef *error);
bool LAVerifySEP(uid_t pw_uid, CFErrorRef *error);

CF_EXTERN_C_END

#endif
9 changes: 5 additions & 4 deletions src/frameworks/LocalAuthentication/src/stubs.c
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#include <stddef.h>
#include <LocalAuthentication/LAPrivateDefines.h>

void* LAEvaluatePolicy() {
return NULL;
bool LAEvaluatePolicy(CFTypeRef context, int policy, CFMutableDictionaryRef options, CFErrorRef *error) {
return false;
};

void* LAVerifySEP() {
return NULL;
bool LAVerifySEP(uid_t pw_uid, CFErrorRef *error) {
return false;
};
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,10 @@ tDirStatus ODConvertToLegacyErrorCode(CFIndex code) __OSX_AVAILABLE_STARTING(__M
CF_EXPORT
bool ODRecordContainsMemberRefresh(ODRecordRef inGroupRef, ODRecordRef inMemberRef, CFErrorRef *outError) __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_NA);

#ifdef DARLING
bool ODRecordSetNodeCredentialsWithBootstrapToken(ODRecordRef cfRecord, CFStringRef token, CFErrorRef *error);
#endif

__END_DECLS

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -21,115 +21,22 @@
#ifndef _CFOpenDirectory_H_
#define _CFOpenDirectory_H_

void* ODContextGetTypeID(void);
void* ODConvertToLegacyErrorCode(void);
void* ODNodeAddAccountPolicy(void);
void* ODNodeCopyAccountPolicies(void);
void* ODNodeCopyCredentials(void);
void* ODNodeCopyDetails(void);
void* ODNodeCopyPolicies(void);
void* ODNodeCopyRecord(void);
void* ODNodeCopyRecordAuthenticationData(void);
void* ODNodeCopySession(void);
void* ODNodeCopySubnodeNames(void);
void* ODNodeCopySupportedAttributes(void);
void* ODNodeCopySupportedPolicies(void);
void* ODNodeCopySupportedRecordTypes(void);
void* ODNodeCopyUnreachableSubnodeNames(void);
void* ODNodeCreateCopy(void);
void* ODNodeCreateRecord(void);
void* ODNodeCreateWithDSRef(void);
void* ODNodeCreateWithName(void);
void* ODNodeCreateWithNameAndOptions(void);
void* ODNodeCreateWithNodeType(void);
void* ODNodeCustomCall(void);
void* ODNodeCustomFunction(void);
void* ODNodeGetDSRef(void);
void* ODNodeGetName(void);
void* ODNodeGetSecureTokenRecoveryType(void);
void* ODNodeGetTypeID(void);
void* ODNodePasswordContentCheck(void);
void* ODNodeRemoveAccountPolicy(void);
void* ODNodeRemovePolicy(void);
void* ODNodeReplaceUserRecord(void);
void* ODNodeSetAccountPolicies(void);
void* ODNodeSetCredentials(void);
void* ODNodeSetCredentialsExtended(void);
void* ODNodeSetCredentialsUsingKerberosCache(void);
void* ODNodeSetCredentialsWithBootstrapToken(void);
void* ODNodeSetPolicies(void);
void* ODNodeSetPolicy(void);
void* ODNodeSetSecureTokenRecoveryCloud(void);
void* ODNodeSetSecureTokenRecoveryCloudUsingIdentity(void);
void* ODNodeSetSecureTokenRecoveryMasterPassword(void);
void* ODNodeSetSecureTokenRecoveryPersonal(void);
void* ODNodeSetSecureTokenRecoveryPersonalUsingKey(void);
void* ODNodeVerifyCredentialsExtended(void);
void* ODQueryCopyResults(void);
void* ODQueryCreateWithNode(void);
void* ODQueryCreateWithNodeType(void);
void* ODQueryGetTypeID(void);
void* ODQueryScheduleWithRunLoop(void);
void* ODQuerySetCallback(void);
void* ODQuerySetDispatchQueue(void);
void* ODQuerySynchronize(void);
void* ODQueryUnscheduleFromRunLoop(void);
void* ODRecordAddAccountPolicy(void);
void* ODRecordAddMember(void);
void* ODRecordAddValue(void);
void* ODRecordAuthenticationAllowed(void);
void* ODRecordChangePassword(void);
void* ODRecordContainsMember(void);
void* ODRecordContainsMemberRefresh(void);
void* ODRecordCopyAccountPolicies(void);
void* ODRecordCopyDetails(void);
void* ODRecordCopyEffectivePolicies(void);
void* ODRecordCopyPasswordContentSummary(void);
void* ODRecordCopyPasswordPolicy(void);
void* ODRecordCopyPolicies(void);
void* ODRecordCopySupportedPolicies(void);
void* ODRecordCopyValues(void);
void* ODRecordDelete(void);
void* ODRecordEnumerateMembers(void);
void* ODRecordEnumerateMembership(void);
void* ODRecordGetRecordName(void);
void* ODRecordGetRecordType(void);
void* ODRecordGetTypeID(void);
void* ODRecordPasswordChangeAllowed(void);
void* ODRecordRemoveAccountPolicy(void);
void* ODRecordRemoveMember(void);
void* ODRecordRemovePolicy(void);
void* ODRecordRemoveValue(void);
void* ODRecordSecondsUntilAuthenticationsExpire(void);
void* ODRecordSecondsUntilPasswordExpires(void);
void* ODRecordSetAccountPolicies(void);
void* ODRecordSetNodeCredentials(void);
void* ODRecordSetNodeCredentialsExtended(void);
void* ODRecordSetNodeCredentialsUsingKerberosCache(void);
void* ODRecordSetNodeCredentialsWithBootstrapToken(void);
void* ODRecordSetPolicies(void);
void* ODRecordSetPolicy(void);
void* ODRecordSetValue(void);
void* ODRecordSynchronize(void);
void* ODRecordVerifyPassword(void);
void* ODRecordVerifyPasswordExtended(void);
void* ODRecordWillAuthenticationsExpire(void);
void* ODRecordWillPasswordExpire(void);
void* ODSessionCopyNodeNames(void);
void* ODSessionCopySessionKeySupport(void);
void* ODSessionCreate(void);
void* ODSessionCreateWithDSRef(void);
void* ODSessionGetDSRef(void);
void* ODSessionGetTypeID(void);
void* ODSessionIsProxy(void);
void* ODSessionNodeNameIsLocal(void);
void* ODSessionProxyAuthorizationForm(void);
void* ODTriggerCancel(void);
void* ODTriggerCreateForNodes(void);
void* ODTriggerCreateForRecordAttributes(void);
void* ODTriggerCreateForRecords(void);
void* ODTriggerCreateForSearch(void);
void* ODTriggerGetTypeID(void);
void* _NodeGetNodeTypeName(void);
void* _ODInitialize(void);
void* _ODNodeCreate(void);
Expand All @@ -140,7 +47,6 @@ void* _ODQueryGetOperationQueue(void);
void* _ODQueryInit(void);
void* _ODQuerySetDelegate(void);
void* _ODQuerySetOperationQueue(void);
void* _ODSessionCreate(void);
void* _ODSessionGetShared(void);
void* _ODSessionInit(void);

Expand Down
Loading

0 comments on commit 7bb0dbb

Please sign in to comment.